File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -137,7 +137,7 @@ extern NSNotificationName const VNADatabaseDidDeleteFolderNotification;
137137-(NSArray <Article *> *)arrayOfArticles : (NSInteger )folderId filterString : (NSString *)filterString ;
138138-(void )markArticleRead : (NSInteger )folderId guid : (NSString *)guid isRead : (BOOL )isRead ;
139139-(void )markArticleFlagged : (NSInteger )folderId guid : (NSString *)guid isFlagged : (BOOL )isFlagged ;
140- -(void )markArticleDeleted : (Article *) article isDeleted : (BOOL )isDeleted ;
140+ -(void )markArticleDeleted : (NSInteger ) folderId guid : ( NSString *) guid isDeleted : (BOOL )isDeleted ;
141141-(void )markUnreadArticlesFromFolder : (Folder *)folder guidArray : (NSArray *)guidArray ;
142142-(void )markStarredArticlesFromFolder : (Folder *)folder guidArray : (NSArray *)guidArray ;
143143@property (nonatomic , getter =isTrashEmpty, readonly ) BOOL trashEmpty;
Original file line number Diff line number Diff line change @@ -2497,24 +2497,21 @@ -(void)markArticleFlagged:(NSInteger)folderId guid:(NSString *)guid isFlagged:(B
24972497/* markArticleDeleted
24982498 * Marks an article as deleted. Deleted articles should have been marked read first.
24992499 */
2500- -(void )markArticleDeleted: (Article *)article isDeleted: (BOOL )isDeleted
2500+ -(void )markArticleDeleted: (NSInteger )folderId guid: ( NSString *)guid isDeleted: (BOOL )isDeleted
25012501{
2502- NSInteger folderId = article.folderId ;
2503- NSString * guid = article.guid ;
2504- Folder * folder = [self folderFromID: folderId];
2505- if (folder !=nil ) {
2506- if (isDeleted && !article.isRead ) {
2507- [self markArticleRead: folderId guid: guid isRead: YES ];
2508- }
2502+ Folder * folder = [self folderFromID: folderId];
2503+ if (folder !=nil ) {
2504+ if (isDeleted) {
2505+ [self markArticleRead: folderId guid: guid isRead: YES ];
2506+ }
25092507 FMDatabaseQueue *queue = self.databaseQueue ;
25102508 [queue inDatabase: ^(FMDatabase *db) {
25112509 [db executeUpdate: @" UPDATE messages SET deleted_flag=? WHERE folder_id=? AND message_id=?" ,
25122510 @(isDeleted),
25132511 @(folderId),
25142512 guid];
25152513 }];
2516- article.deleted = isDeleted;
2517- }
2514+ }
25182515}
25192516
25202517/* isTrashEmpty
Original file line number Diff line number Diff line change @@ -648,7 +648,7 @@ -(void)markDeletedByArray:(NSArray *)articleArray deleteFlag:(BOOL)deleteFlag
648648 // Iterate over every selected article in the table and set the deleted
649649 // flag on the article while simultaneously removing it from our copies
650650 for (Article * theArticle in articleArray) {
651- [[Database sharedManager ] markArticleDeleted: theArticle isDeleted: deleteFlag];
651+ [[Database sharedManager ] markArticleDeleted: theArticle.folderId guid: theArticle.guid isDeleted: deleteFlag];
652652 theArticle.deleted = deleteFlag;
653653 if (![currentArrayOfArticles containsObject: theArticle]) {
654654 needReload = YES ;
You can’t perform that action at this time.
0 commit comments