Assume -articleFromGuid: return is non nullable

Author: barijaona

Vienna/Sources/Database/Database.m

@@ -2386,7 +2386,7 @@ -(void)markArticleRead:(NSInteger)folderId guid:(NSString *)guid isRead:(BOOL)is
 	Folder * folder = [self folderFromID:folderId];
 	if (folder != nil) {
 		Article * article = [folder articleFromGuid:guid];
-		if (article != nil && isRead != article.isRead) {
+		if (isRead != article.isRead) {
 			// Mark an individual article read
             FMDatabaseQueue *queue = self.databaseQueue;
             __block BOOL success;
@@ -2481,7 +2481,7 @@ -(void)markArticleFlagged:(NSInteger)folderId guid:(NSString *)guid isFlagged:(B
 	Folder * folder = [self folderFromID:folderId];
 	if (folder != nil) {
 		Article * article = [folder articleFromGuid:guid];
-		if (article != nil && isFlagged != article.isFlagged) {
+		if (isFlagged != article.isFlagged) {
             FMDatabaseQueue *queue = self.databaseQueue;
             __block BOOL success;
             [queue inDatabase:^(FMDatabase *db) {

Vienna/Sources/Main window/ArticleController.m

@@ -865,9 +865,7 @@ -(void)innerMarkReadByRefsArray:(NSArray *)articleArray readFlag:(BOOL)readFlag
 		Folder * folder = [db folderFromID:folderId];
 		if (folder.type == VNAFolderTypeOpenReader){
 			Article * article = [folder articleFromGuid:articleRef.guid];
-			if (article != nil) {
-                [[OpenReader sharedManager] markRead:article readFlag:readFlag];
-			}
+            [[OpenReader sharedManager] markRead:article readFlag:readFlag];
 		} else {
 			[db markArticleRead:folderId guid:articleRef.guid isRead:readFlag];
 		}
@@ -962,9 +960,7 @@ -(void)markAllReadByReferencesArray:(NSArray *)refArray readFlag:(BOOL)readFlag
 		Folder * folder = [dbManager folderFromID:folderId];
         if (folder.type == VNAFolderTypeOpenReader) {
         	Article * article = [folder articleFromGuid:theGuid];
-        	if (article != nil) {
-			    [[OpenReader sharedManager] markRead:article readFlag:readFlag];
-			}
+            [[OpenReader sharedManager] markRead:article readFlag:readFlag];
         } else {
 			[dbManager markArticleRead:folderId guid:theGuid isRead:readFlag];
 		}

Vienna/Sources/Models/Folder.m

@@ -452,6 +452,7 @@ -(Article *)articleFromGuid:(NSString *)guid
         [self ensureCache];
         article = [self.cachedArticles objectForKey:guid];
     }
+    NSAssert(article != nil, @" %@ : cache still defective, attempting guid %@", self.description, guid);
     return article;
 }