Merge branch 'master' into accent-color-experimental
This commit is contained in:
commit
ff3a0507a6
|
@ -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)
|
||||
}
|
||||
|
|
|
@ -91,7 +91,7 @@ class RootSplitViewController: UISplitViewController {
|
|||
}
|
||||
|
||||
@objc func cleanUp(_ sender: Any?) {
|
||||
coordinator.cleanUp()
|
||||
coordinator.cleanUp(conditional: false)
|
||||
}
|
||||
|
||||
@objc func toggleReadFeedsFilter(_ sender: Any?) {
|
||||
|
|
|
@ -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)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -84,8 +84,8 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
|
|||
coordinator.suspend()
|
||||
}
|
||||
|
||||
func cleanUp() {
|
||||
coordinator.cleanUp()
|
||||
func cleanUp(conditional: Bool) {
|
||||
coordinator.cleanUp(conditional: conditional)
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 5c9d9c575c8bad32cf12ee81243e6a7d28021667
|
||||
Subproject commit aa4fda94f0e81809ac23de4040512378132f9e5d
|
Loading…
Reference in New Issue