diff --git a/iOS/MasterTimeline/MasterTimelineViewController.swift b/iOS/MasterTimeline/MasterTimelineViewController.swift index 01fdb9dca..82195883d 100644 --- a/iOS/MasterTimeline/MasterTimelineViewController.swift +++ b/iOS/MasterTimeline/MasterTimelineViewController.swift @@ -145,6 +145,13 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner // MARK: API + func restoreSelectionIfNecessary() { + if let articleID = coordinator.currentArticle?.articleID, let index = coordinator.indexForArticleID(articleID) { + let indexPath = IndexPath(row: index, section: 0) + tableView.selectRowAndScrollIfNotVisible(at: indexPath, animated: false, deselect: coordinator.isRootSplitCollapsed) + } + } + func reinitializeArticles() { resetUI() } @@ -527,13 +534,6 @@ private extension MasterTimelineViewController { } return nil } - - func restoreSelectionIfNecessary() { - if let articleID = coordinator.currentArticle?.articleID, let index = coordinator.indexForArticleID(articleID) { - let indexPath = IndexPath(row: index, section: 0) - tableView.selectRowAndScrollIfNotVisible(at: indexPath, animated: false, deselect: coordinator.isRootSplitCollapsed) - } - } func toggleArticleReadStatusAction(indexPath: IndexPath) -> UIAction { let article = coordinator.articles[indexPath.row] diff --git a/iOS/SceneCoordinator.swift b/iOS/SceneCoordinator.swift index 42f9e53b4..531c43945 100644 --- a/iOS/SceneCoordinator.swift +++ b/iOS/SceneCoordinator.swift @@ -1620,6 +1620,8 @@ private extension SceneCoordinator { let navController = addNavControllerIfNecessary(controller, showButton: false) subSplitViewController!.showDetailViewController(navController, sender: self) + masterTimelineViewController!.restoreSelectionIfNecessary() + // Return the shim controller return subSplitViewController!.parent!