FreshRSS/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire.git synced 2024-12-22 23:58:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't clear the current article activities if we have a article view controller push pending.

Browse Source
This commit is contained in:
Maurice Parker 2019-10-01 03:51:48 -05:00
parent 4e6e61842a
commit 14e808971d
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
iOS/SceneCoordinator.swift
View File

@ -65,6 +65,7 @@ class SceneCoordinator: NSObject, UndoableCommandRunner, UnreadCountProvider {
private var lastSearchScope: SearchScope? = nil
private var isSearching: Bool = false
private var searchArticleIds: Set<String>? = nil
private var isArticleViewControllerPending = false
private(set) var sortDirection = AppDefaults.timelineSortDirection {
didSet {
@ -925,13 +926,22 @@ extension SceneCoordinator: UINavigationControllerDelegate {
if viewController === masterFeedViewController && !isThreePanelMode {
activityManager.invalidateCurrentActivities()
selectFeed(nil)
return
}
// If we are using a phone and navigate away from the detail, clear up the article resources (including activity)
if viewController === masterTimelineViewController && !isThreePanelMode && rootSplitViewController.isCollapsed {
// If we are using a phone and navigate away from the detail, clear up the article resources (including activity).
// Don't clear it if we have pushed an ArticleViewController, but don't yet see it on the navigation stack.
// This happens when we are going to the next unread and we need to grab another timeline to continue. The
// ArticleViewController will be pushed, but we will breifly show the Timeline. Don't clear things out when that happens.
if viewController === masterTimelineViewController && !isThreePanelMode && rootSplitViewController.isCollapsed && !isArticleViewControllerPending {
stopArticleExtractor()
currentArticle = nil
activityManager.invalidateReading()
return
}
if viewController is ArticleViewController {
isArticleViewControllerPending = false
}
}
@ -1434,6 +1444,8 @@ private extension SceneCoordinator {
func installArticleController(_ articleController: UIViewController, automated: Bool) {
isArticleViewControllerPending = true
if let subSplit = subSplitViewController {
let controller = addNavControllerIfNecessary(articleController, showButton: false)
subSplit.showDetailViewController(controller, sender: self)