Preserve current selected article on refreshes

- article preservation should not be subject to user's preferences
- remove disturbing notification in OpenReader
- partially reverse commits 3824152 and b31d75d
- reverse 7dec77e which does not solde issue #658 anymore, use another
  trick in mainArticleView's scrollToArticle

Vienna/Sources/Fetching/OpenReader.m

@@ -794,8 +794,6 @@ -(void)starredRequestDone:(NSMutableURLRequest *)request response:(NSURLResponse
                     [guidArray addObject:guid];
                     [[refreshedFolder articleFromGuid:guid] markFlagged:YES];
                 }
-                [[NSNotificationCenter defaultCenter] vna_postNotificationOnMainThreadWithName:MA_Notify_ArticleListContentChange object:@(
-                     refreshedFolder.itemId)];
 
                 [[Database sharedManager] markStarredArticlesFromFolder:refreshedFolder guidArray:guidArray];
 

Vienna/Sources/Main window/ArticleController.m

@@ -59,12 +59,10 @@ @implementation ArticleController {
     NSString *sortColumnIdentifier;
     BackTrackArray *backtrackArray;
     BOOL isBacktracking;
-    BOOL shouldPreserveSelectedArticle;
     Article *articleToPreserve;
     NSString *guidOfArticleToSelect;
     BOOL firstUnreadArticleRequired;
     dispatch_queue_t queue;
-    BOOL requireSelectArticleAfterReload;
 }
 
 @synthesize mainArticleView, currentArrayOfArticles, folderArrayOfArticles, articleSortSpecifiers, backtrackArray;
@@ -147,7 +145,6 @@ -(instancetype)init
                                                  context:VNAArticleControllerObserverContext];
 
         queue = dispatch_queue_create("uk.co.opencommunity.vienna2.displayRefresh", DISPATCH_QUEUE_SERIAL);
-        requireSelectArticleAfterReload = NO;
     }
     return self;
 }
@@ -431,13 +428,10 @@ -(void)displayNextFolderWithUnread
 -(void)displayFolder:(NSInteger)newFolderId
 {
 	if (currentFolderId != newFolderId && newFolderId != 0) {
-		// Clear all of the articles in the current folder.
-		// This will reset the scroller position and deselect all.
+		// Deselect all in current folder.
 		// Otherwise, the new folder might attempt to preserve selection.
 		// This can happen with smart folders, which have the same articles as other folders.
-		self.currentArrayOfArticles = @[];
-		self.folderArrayOfArticles = @[];
-		[mainArticleView refreshFolder:VNARefreshRedrawList];
+		[mainArticleView scrollToArticle:nil];
 
 		currentFolderId = newFolderId;
 		[self reloadArrayOfArticles];
@@ -477,11 +471,13 @@ -(void)reloadArrayOfArticles
     });
     Article *article = self.selectedArticle;
 
-    if (self->shouldPreserveSelectedArticle) {
+    // Make sure selectedArticle hasn't changed since reload started.
+    if (articleToPreserve != nil && articleToPreserve != article) {
         if (article != nil && !article.deleted) {
-            self->articleToPreserve = article;
+            articleToPreserve = article;
+        } else {
+            articleToPreserve = nil;
         }
-        self->shouldPreserveSelectedArticle = NO;
     }
 
     [self->mainArticleView refreshFolder:VNARefreshReapplyFilter];
@@ -494,11 +490,6 @@ -(void)reloadArrayOfArticles
         self->firstUnreadArticleRequired = NO;
     }
 
-    if (self->requireSelectArticleAfterReload) {
-        [self ensureSelectedArticle];
-        self->requireSelectArticleAfterReload = NO;
-    }
-
     // To avoid upsetting the current displayed article after a refresh,
     // we check to see if the selected article is the same
     // and if it has been updated
@@ -1008,11 +999,7 @@ -(void)handleArticleListContentChange:(NSNotification *)note
 	// the article you're current reading can disappear.
 	// For example, if you're reading in the Unread Articles smart folder.
 	// So make sure we keep this article around.
-    if ([Preferences standardPreferences].refreshFrequency > 0
-        && [Preferences standardPreferences].markReadInterval > 0.0)
-	{
-		shouldPreserveSelectedArticle = YES;
-	}
+	articleToPreserve = self.selectedArticle;
     [self reloadArrayOfArticles];
 }
 

Vienna/Sources/Main window/ArticleListView.m

@@ -628,6 +628,8 @@ -(void)scrollToArticle:(NSString *)guid
 			}
 			++rowIndex;
 		}
+	} else {
+		[articleList scrollRowToVisible:0];
 	}
 
 	[articleList deselectAll:self];

Vienna/Sources/Main window/UnifiedDisplayView.m

@@ -212,6 +212,8 @@ -(void)scrollToArticle:(NSString *)guid
 			}
 			++rowIndex;
 		}
+	} else {
+		[articleList scrollRowToVisible:0];
 	}
 
 	[articleList deselectAll:self];