diff --git a/iOS/AppDelegate.swift b/iOS/AppDelegate.swift index a1a9bb39a..e6f25a9ce 100644 --- a/iOS/AppDelegate.swift +++ b/iOS/AppDelegate.swift @@ -135,7 +135,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD func manualRefresh(errorHandler: @escaping (Error) -> ()) { UIApplication.shared.connectedScenes.compactMap( { $0.delegate as? SceneDelegate } ).forEach { - $0.cleanUp() + $0.cleanUp(conditional: true) } AccountManager.shared.refreshAll(errorHandler: errorHandler) } diff --git a/iOS/RootSplitViewController.swift b/iOS/RootSplitViewController.swift index df3805331..4a95fee0e 100644 --- a/iOS/RootSplitViewController.swift +++ b/iOS/RootSplitViewController.swift @@ -91,7 +91,7 @@ class RootSplitViewController: UISplitViewController { } @objc func cleanUp(_ sender: Any?) { - coordinator.cleanUp() + coordinator.cleanUp(conditional: false) } @objc func toggleReadFeedsFilter(_ sender: Any?) { diff --git a/iOS/SceneCoordinator.swift b/iOS/SceneCoordinator.swift index 3c5f552af..4c3c0b108 100644 --- a/iOS/SceneCoordinator.swift +++ b/iOS/SceneCoordinator.swift @@ -572,11 +572,11 @@ class SceneCoordinator: NSObject, UndoableCommandRunner, UnreadCountProvider { fetchRequestQueue.cancelAllRequests() } - func cleanUp() { + func cleanUp(conditional: Bool) { if isReadFeedsFiltered { rebuildBackingStores() } - if isReadArticlesFiltered && AppDefaults.refreshClearsReadArticles { + if isReadArticlesFiltered && (AppDefaults.refreshClearsReadArticles || !conditional) { refreshTimeline(resetScroll: false) } } diff --git a/iOS/SceneDelegate.swift b/iOS/SceneDelegate.swift index 7fb620f1c..f95678c83 100644 --- a/iOS/SceneDelegate.swift +++ b/iOS/SceneDelegate.swift @@ -84,8 +84,8 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate { coordinator.suspend() } - func cleanUp() { - coordinator.cleanUp() + func cleanUp(conditional: Bool) { + coordinator.cleanUp(conditional: conditional) } } diff --git a/submodules/RSWeb b/submodules/RSWeb index 5c9d9c575..aa4fda94f 160000 --- a/submodules/RSWeb +++ b/submodules/RSWeb @@ -1 +1 @@ -Subproject commit 5c9d9c575c8bad32cf12ee81243e6a7d28021667 +Subproject commit aa4fda94f0e81809ac23de4040512378132f9e5d