FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change to resume database earlier for notifications and home screen shortcuts. Issue #1597

Browse Source
This commit is contained in:
Maurice Parker 2020-01-10 16:32:06 -07:00
parent 2421305750
commit 9a3763f57a
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
iOS/AppDelegate.swift
View File

@ -126,6 +126,12 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
} }
// MARK: - API // MARK: - API
func resumeDatabaseProcessingIfNecessary() {
if AccountManager.shared.isSuspended {
AccountManager.shared.resumeAll()
os_log("Application processing resumed.", log: self.log, type: .info)
}
}
func prepareAccountsForBackground() { func prepareAccountsForBackground() {
syncTimer?.invalidate() syncTimer?.invalidate()
@ -135,11 +141,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
} }
func prepareAccountsForForeground() { func prepareAccountsForForeground() {
if AccountManager.shared.isSuspended {
AccountManager.shared.resumeAll()
os_log("Application processing resumed.", log: self.log, type: .info)
}
if let lastRefresh = AppDefaults.lastRefresh { if let lastRefresh = AppDefaults.lastRefresh {
if Date() > lastRefresh.addingTimeInterval(15 * 60) { if Date() > lastRefresh.addingTimeInterval(15 * 60) {
AccountManager.shared.refreshAll(errorHandler: ErrorHandler.log) AccountManager.shared.refreshAll(errorHandler: ErrorHandler.log)

4
iOS/SceneDelegate.swift
View File

@ -45,11 +45,13 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
} }
func windowScene(_ windowScene: UIWindowScene, performActionFor shortcutItem: UIApplicationShortcutItem, completionHandler: @escaping (Bool) -> Void) { func windowScene(_ windowScene: UIWindowScene, performActionFor shortcutItem: UIApplicationShortcutItem, completionHandler: @escaping (Bool) -> Void) {
appDelegate.resumeDatabaseProcessingIfNecessary()
handleShortcutItem(shortcutItem) handleShortcutItem(shortcutItem)
completionHandler(true) completionHandler(true)
} }
func scene(_ scene: UIScene, continue userActivity: NSUserActivity) { func scene(_ scene: UIScene, continue userActivity: NSUserActivity) {
appDelegate.resumeDatabaseProcessingIfNecessary()
coordinator.handle(userActivity) coordinator.handle(userActivity)
} }
@ -59,6 +61,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
} }
func sceneWillEnterForeground(_ scene: UIScene) { func sceneWillEnterForeground(_ scene: UIScene) {
appDelegate.resumeDatabaseProcessingIfNecessary()
appDelegate.prepareAccountsForForeground() appDelegate.prepareAccountsForForeground()
self.coordinator.configurePanelMode(for: window!.frame.size) self.coordinator.configurePanelMode(for: window!.frame.size)
} }
@ -70,6 +73,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
// API // API
func handle(_ response: UNNotificationResponse) { func handle(_ response: UNNotificationResponse) {
appDelegate.resumeDatabaseProcessingIfNecessary()
coordinator.handle(response) coordinator.handle(response)
} }