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

Corrects issues related to PR #767

This commit is contained in:
Stuart Breckenridge 2019-06-20 07:09:42 +08:00
parent c035bfe586
commit 3e54482952
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
iOS/AppDelegate.swift
View File

@ -19,6 +19,8 @@ var appDelegate: AppDelegate!
@UIApplicationMain
class AppDelegate: UIResponder, UIApplicationDelegate, UISplitViewControllerDelegate, UnreadCountProvider {
private var syncBackgroundUpdateTask = UIBackgroundTaskIdentifier.invalid
var syncTimer: ArticleStatusSyncTimer?
var shuttingDown = false {
@ -145,6 +147,25 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UISplitViewControllerDele
// Schedule background app refresh
scheduleBackgroundFeedRefresh()
// Sync article status
let completeProcessing = { [unowned self] in
UIApplication.shared.endBackgroundTask(self.syncBackgroundUpdateTask)
self.syncBackgroundUpdateTask = UIBackgroundTaskIdentifier.invalid
}
DispatchQueue.global(qos: .background).async {
self.syncBackgroundUpdateTask = UIApplication.shared.beginBackgroundTask {
completeProcessing()
os_log("Accounts sync processing terminated for running too long.", log: self.log, type: .info)
}
DispatchQueue.main.async {
AccountManager.shared.syncArticleStatusAll() {
completeProcessing()
}
}
}
}
func applicationWillEnterForeground(_ application: UIApplication) {
@ -189,7 +210,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UISplitViewControllerDele
}
@objc func userDefaultsDidChange(_ note: Notification) {
//updateBackgroundRefreshInterval()
scheduleBackgroundFeedRefresh()
}
@ -229,7 +249,7 @@ private extension AppDelegate {
do {
try BGTaskScheduler.shared.submit(request)
} catch {
print("Could not schedule app refresh: \(error)")
os_log(.error, log: self.log, "Could not schedule app refresh: %@", error.localizedDescription)
}
}
@ -286,14 +306,6 @@ private extension AppDelegate {
private extension AppDelegate {
// func updateBackgroundRefreshInterval() {
// let refreshInterval = AppDefaults.refreshInterval
// if refreshInterval == .manually {
// UIApplication.shared.setMinimumBackgroundFetchInterval(UIApplication.backgroundFetchIntervalNever)
// } else {
// UIApplication.shared.setMinimumBackgroundFetchInterval(AppDefaults.refreshInterval.inSeconds())
// }
// }
func sendReceivedArticlesUserNotification(newArticleCount: Int) {