From 3e54482952a513e9a0ae3518e8480588a02ab7a7 Mon Sep 17 00:00:00 2001
From: Stuart Breckenridge <stuart.breckenridge@icloud.com>
Date: Thu, 20 Jun 2019 07:09:42 +0800
Subject: [PATCH] Corrects issues related to PR #767

---
 iOS/AppDelegate.swift | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/iOS/AppDelegate.swift b/iOS/AppDelegate.swift
index 10e13da2b..d03cae7e5 100644
--- a/iOS/AppDelegate.swift
+++ b/iOS/AppDelegate.swift
@@ -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) {