Skip to content

Commit 0760d38

Browse files
authored
Merge pull request #1828 from barijaona/articleCache
Extend control by begin / endContentAccess
2 parents 96ca526 + 49b47a5 commit 0760d38

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

Vienna/Sources/Main window/ArticleController.m

+7-1
Original file line numberDiff line numberDiff line change
@@ -530,13 +530,15 @@ -(void)refilterArrayOfArticles
530530
NSInteger filterMode = [Preferences standardPreferences].filterMode;
531531
for (NSInteger index = filteredArray.count - 1; index >= 0; --index) {
532532
Article * article = filteredArray[index];
533-
if (guidOfArticleToPreserve != nil
533+
[article beginContentAccess];
534+
if (guidOfArticleToPreserve != nil
534535
&& article.folderId == articleToPreserve.folderId
535536
&& [article.guid isEqualToString:guidOfArticleToPreserve]) {
536537
guidOfArticleToPreserve = nil;
537538
} else if ([self filterArticle:article usingMode:filterMode] == false) {
538539
[filteredArray removeObjectAtIndex:index];
539540
}
541+
[article endContentAccess];
540542
}
541543

542544
if (guidOfArticleToPreserve != nil) {
@@ -750,6 +752,7 @@ -(void)markFlaggedByArray:(NSArray *)articleArray flagged:(BOOL)flagged
750752
-(void)innerMarkFlaggedByArray:(NSArray *)articleArray flagged:(BOOL)flagged
751753
{
752754
for (Article * theArticle in articleArray) {
755+
[theArticle beginContentAccess];
753756
Folder *myFolder = [[Database sharedManager] folderFromID:theArticle.folderId];
754757
if (myFolder.type == VNAFolderTypeOpenReader) {
755758
[[OpenReader sharedManager] markStarred:theArticle starredFlag:flagged];
@@ -758,6 +761,7 @@ -(void)innerMarkFlaggedByArray:(NSArray *)articleArray flagged:(BOOL)flagged
758761
guid:theArticle.guid
759762
isFlagged:flagged];
760763
[theArticle markFlagged:flagged];
764+
[theArticle endContentAccess];
761765
}
762766
}
763767

@@ -803,6 +807,7 @@ -(void)markReadByArray:(NSArray *)articleArray readFlag:(BOOL)readFlag
803807
-(void)innerMarkReadByArray:(NSArray *)articleArray readFlag:(BOOL)readFlag
804808
{
805809
for (Article * theArticle in articleArray) {
810+
[theArticle beginContentAccess];
806811
NSInteger folderId = theArticle.folderId;
807812
if (theArticle.read != readFlag) {
808813
if ([[Database sharedManager] folderFromID:folderId].type == VNAFolderTypeOpenReader) {
@@ -812,6 +817,7 @@ -(void)innerMarkReadByArray:(NSArray *)articleArray readFlag:(BOOL)readFlag
812817
[theArticle markRead:readFlag];
813818
}
814819
}
820+
[theArticle endContentAccess];
815821
}
816822
}
817823

0 commit comments

Comments
 (0)