From ee46a749262fd580b6574034f3f2f8a6b6c1b5dd Mon Sep 17 00:00:00 2001
From: Brent Simmons <brent@ranchero.com>
Date: Mon, 30 Dec 2024 15:17:20 -0800
Subject: [PATCH] Use logger instead of os_log.

---
 iOS/AppDelegate.swift | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/iOS/AppDelegate.swift b/iOS/AppDelegate.swift
index 1d7b7ea92..a6ba19dd0 100644
--- a/iOS/AppDelegate.swift
+++ b/iOS/AppDelegate.swift
@@ -11,7 +11,7 @@ import RSCore
 import RSWeb
 import Account
 import BackgroundTasks
-import os.log
+import os
 import Secrets
 import WidgetKit
 
@@ -36,8 +36,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
 		}
 	}
 	
-	var log = OSLog(subsystem: Bundle.main.bundleIdentifier!, category: "Application")
-	
+	private let logger = Logger(subsystem: Bundle.main.bundleIdentifier!, category: "Application")
+
 	var userNotificationManager: UserNotificationManager!
 	var faviconDownloader: FaviconDownloader!
 	var extensionContainersFile: ExtensionContainersFile!
@@ -79,7 +79,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
 
 		let isFirstRun = AppDefaults.shared.isFirstRun
 		if isFirstRun {
-			os_log("Is first run.", log: log, type: .info)
+			logger.info("Is first run.")
 		}
 		
 		if isFirstRun && !AccountManager.shared.anyAccountHasAtLeastOneFeed() {
@@ -164,7 +164,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
 	func resumeDatabaseProcessingIfNecessary() {
 		if AccountManager.shared.isSuspended {
 			AccountManager.shared.resumeAll()
-			os_log("Application processing resumed.", log: self.log, type: .info)
+			logger.info("Application processing resumed.")
 		}
 	}
 	
@@ -266,7 +266,7 @@ private extension AppDelegate {
 		self.waitBackgroundUpdateTask = UIApplication.shared.beginBackgroundTask { [weak self] in
 			guard let self = self else { return }
 			self.completeProcessing(true)
-			os_log("Accounts wait for progress terminated for running too long.", log: self.log, type: .info)
+			logger.info("Accounts wait for progress terminated for running too long.")
 		}
 		
 		DispatchQueue.main.async { [weak self] in
@@ -278,18 +278,18 @@ private extension AppDelegate {
 	
 	func waitToComplete(completion: @escaping (Bool) -> Void) {
 		guard UIApplication.shared.applicationState == .background else {
-			os_log("App came back to foreground, no longer waiting.", log: self.log, type: .info)
+			logger.info("App came back to foreground, no longer waiting.")
 			completion(false)
 			return
 		}
 		
 		if AccountManager.shared.refreshInProgress || isSyncArticleStatusRunning || widgetDataEncoder.isRunning {
-			os_log("Waiting for sync to finish...", log: self.log, type: .info)
+			logger.info("Waiting for sync to finish…")
 			DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) { [weak self] in
 				self?.waitToComplete(completion: completion)
 			}
 		} else {
-			os_log("Refresh progress complete.", log: self.log, type: .info)
+			logger.info("Refresh progress complete.")
 			completion(true)
 		}
 	}
@@ -316,7 +316,7 @@ private extension AppDelegate {
 		
 		self.syncBackgroundUpdateTask = UIApplication.shared.beginBackgroundTask {
 			completeProcessing()
-			os_log("Accounts sync processing terminated for running too long.", log: self.log, type: .info)
+			self.logger.info("Accounts sync processing terminated for running too long.")
 		}
 		
 		DispatchQueue.main.async {
@@ -340,7 +340,7 @@ private extension AppDelegate {
 			}
 		}
 		
-		os_log("Application processing suspended.", log: self.log, type: .info)
+		logger.info("Application processing suspended.")
 	}
 	
 }
@@ -368,7 +368,7 @@ private extension AppDelegate {
 			do {
 				try BGTaskScheduler.shared.submit(request)
 			} catch {
-				os_log(.error, log: self.log, "Could not schedule app refresh: %@", error.localizedDescription)
+				self.logger.error("Could not schedule app refresh: \(error.localizedDescription)")
 			}
 		}
 	}
@@ -380,7 +380,7 @@ private extension AppDelegate {
 
 		scheduleBackgroundFeedRefresh() // schedule next refresh
 
-		os_log("Woken to perform account refresh.", log: self.log, type: .info)
+		logger.info("Woken to perform account refresh.")
 
 		DispatchQueue.main.async {
 			if AccountManager.shared.isSuspended {
@@ -389,7 +389,7 @@ private extension AppDelegate {
 			AccountManager.shared.refreshAll(errorHandler: ErrorHandler.log) { [unowned self] in
 				if !AccountManager.shared.isSuspended {
 					self.suspendApplication()
-					os_log("Account refresh operation completed.", log: self.log, type: .info)
+					logger.info("Account refresh operation completed.")
 					task.setTaskCompleted(success: true)
 				}
 			}
@@ -397,7 +397,7 @@ private extension AppDelegate {
 
 		// set expiration handler
 		task.expirationHandler = { [weak task] in
-			os_log("Accounts refresh processing terminated for running too long.", log: self.log, type: .info)
+			self.logger.info("Accounts refresh processing terminated for running too long.")
 			DispatchQueue.main.async {
 				self.suspendApplication()
 				task?.setTaskCompleted(success: false)