Fix bug where clean up shortcut wouldn't clear articles if wrong setting was off.

This commit is contained in:
Maurice Parker 2020-03-24 16:00:01 -05:00
parent a6e75df412
commit d615a0a894
4 changed files with 6 additions and 6 deletions

View File

@ -135,7 +135,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
func manualRefresh(errorHandler: @escaping (Error) -> ()) { func manualRefresh(errorHandler: @escaping (Error) -> ()) {
UIApplication.shared.connectedScenes.compactMap( { $0.delegate as? SceneDelegate } ).forEach { UIApplication.shared.connectedScenes.compactMap( { $0.delegate as? SceneDelegate } ).forEach {
$0.cleanUp() $0.cleanUp(conditional: true)
} }
AccountManager.shared.refreshAll(errorHandler: errorHandler) AccountManager.shared.refreshAll(errorHandler: errorHandler)
} }

View File

@ -91,7 +91,7 @@ class RootSplitViewController: UISplitViewController {
} }
@objc func cleanUp(_ sender: Any?) { @objc func cleanUp(_ sender: Any?) {
coordinator.cleanUp() coordinator.cleanUp(conditional: false)
} }
@objc func toggleReadFeedsFilter(_ sender: Any?) { @objc func toggleReadFeedsFilter(_ sender: Any?) {

View File

@ -572,11 +572,11 @@ class SceneCoordinator: NSObject, UndoableCommandRunner, UnreadCountProvider {
fetchRequestQueue.cancelAllRequests() fetchRequestQueue.cancelAllRequests()
} }
func cleanUp() { func cleanUp(conditional: Bool) {
if isReadFeedsFiltered { if isReadFeedsFiltered {
rebuildBackingStores() rebuildBackingStores()
} }
if isReadArticlesFiltered && AppDefaults.refreshClearsReadArticles { if isReadArticlesFiltered && (AppDefaults.refreshClearsReadArticles || !conditional) {
refreshTimeline(resetScroll: false) refreshTimeline(resetScroll: false)
} }
} }

View File

@ -84,8 +84,8 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
coordinator.suspend() coordinator.suspend()
} }
func cleanUp() { func cleanUp(conditional: Bool) {
coordinator.cleanUp() coordinator.cleanUp(conditional: conditional)
} }
} }