FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove code duplication in background fetch.

This commit is contained in:
Maurice Parker 2019-04-26 14:03:59 -05:00
parent 9c119ee81d
commit a6370d2c79
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
iOS/AppDelegate.swift
View File

@ -142,12 +142,18 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UISplitViewControllerDele
os_log("Woken to perform account refresh.", log: log, type: .info) os_log("Woken to perform account refresh.", log: log, type: .info)
let startingUnreadCount = unreadCount let startingUnreadCount = unreadCount
let updateCompletionHandler = { [unowned self] in
let completeProcessing = { [unowned self] in
UIApplication.shared.endBackgroundTask(self.backgroundUpdateTask)
self.backgroundUpdateTask = UIBackgroundTaskIdentifier.invalid
if startingUnreadCount != self.unreadCount { if startingUnreadCount != self.unreadCount {
completionHandler(.newData) completionHandler(.newData)
} else { } else {
completionHandler(.noData) completionHandler(.noData)
} }
} }
AccountManager.shared.refreshAll() AccountManager.shared.refreshAll()
@ -157,9 +163,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UISplitViewControllerDele
DispatchQueue.global(qos: .background).async { [unowned self] in DispatchQueue.global(qos: .background).async { [unowned self] in
self.backgroundUpdateTask = UIApplication.shared.beginBackgroundTask { self.backgroundUpdateTask = UIApplication.shared.beginBackgroundTask {
UIApplication.shared.endBackgroundTask(self.backgroundUpdateTask) completeProcessing()
self.backgroundUpdateTask = UIBackgroundTaskIdentifier.invalid
updateCompletionHandler()
} }
sleep(1) sleep(1)
@ -168,12 +172,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UISplitViewControllerDele
sleep(1) sleep(1)
} }
completeProcessing()
os_log("Accounts completed refresh processing.", log: self.log, type: .info) os_log("Accounts completed refresh processing.", log: self.log, type: .info)
UIApplication.shared.endBackgroundTask(self.backgroundUpdateTask)
self.backgroundUpdateTask = UIBackgroundTaskIdentifier.invalid
updateCompletionHandler()
} }
} }