Live activity

.gitignore

@@ -80,4 +80,6 @@ fastlane/test_output
 fastlane/FastlaneRunner
 
 LoopFollowConfigOverride.xcconfig
-.history
+.history*.xcuserstate
+docs/PR_configurable_slots.md
+docs/LiveActivityTestPlan.md

LoopFollow/Application/AppDelegate.swift

@@ -6,7 +6,7 @@ import EventKit
 import UIKit
 import UserNotifications
 
-@UIApplicationMain
+@main
 class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
     let notificationCenter = UNUserNotificationCenter.current()
@@ -32,7 +32,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         }
 
         let action = UNNotificationAction(identifier: "OPEN_APP_ACTION", title: "Open App", options: .foreground)
-        let category = UNNotificationCategory(identifier: "loopfollow.background.alert", actions: [action], intentIdentifiers: [], options: [])
+        let category = UNNotificationCategory(identifier: BackgroundAlertIdentifier.categoryIdentifier, actions: [action], intentIdentifiers: [], options: [])
         UNUserNotificationCenter.current().setNotificationCategories([category])
 
         UNUserNotificationCenter.current().delegate = self
@@ -45,50 +45,64 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         DispatchQueue.main.async {
             UIApplication.shared.registerForRemoteNotifications()
         }
+
+        BackgroundRefreshManager.shared.register()
+
+        // Detect Before-First-Unlock launch. If protected data is unavailable here,
+        // StorageValues were cached from encrypted UserDefaults and need a reload
+        // on the first foreground after the user unlocks.
+        let bfu = !UIApplication.shared.isProtectedDataAvailable
+        Storage.shared.needsBFUReload = bfu
+        LogManager.shared.log(category: .general, message: "BFU check: isProtectedDataAvailable=\(!bfu), needsBFUReload=\(bfu)")
+
         return true
     }
 
-    func applicationWillTerminate(_: UIApplication) {}
+    func applicationWillTerminate(_: UIApplication) {
+        #if !targetEnvironment(macCatalyst)
+            LiveActivityManager.shared.endOnTerminate()
+        #endif
+    }
 
     // MARK: - Remote Notifications
 
-    // Called when successfully registered for remote notifications
+    /// Called when successfully registered for remote notifications
     func application(_: UIApplication, didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {
         let tokenString = deviceToken.map { String(format: "%02.2hhx", $0) }.joined()
 
         Observable.shared.loopFollowDeviceToken.value = tokenString
 
-        LogManager.shared.log(category: .general, message: "Successfully registered for remote notifications with token: \(tokenString)")
+        LogManager.shared.log(category: .apns, message: "Successfully registered for remote notifications with token: \(tokenString)")
     }
 
-    // Called when failed to register for remote notifications
+    /// Called when failed to register for remote notifications
     func application(_: UIApplication, didFailToRegisterForRemoteNotificationsWithError error: Error) {
-        LogManager.shared.log(category: .general, message: "Failed to register for remote notifications: \(error.localizedDescription)")
+        LogManager.shared.log(category: .apns, message: "Failed to register for remote notifications: \(error.localizedDescription)")
     }
 
-    // Called when a remote notification is received
+    /// Called when a remote notification is received
     func application(_: UIApplication, didReceiveRemoteNotification userInfo: [AnyHashable: Any], fetchCompletionHandler completionHandler: @escaping (UIBackgroundFetchResult) -> Void) {
-        LogManager.shared.log(category: .general, message: "Received remote notification: \(userInfo)")
+        LogManager.shared.log(category: .apns, message: "Received remote notification: \(userInfo)")
 
         // Check if this is a response notification from Loop or Trio
         if let aps = userInfo["aps"] as? [String: Any] {
             // Handle visible notification (alert, sound, badge)
             if let alert = aps["alert"] as? [String: Any] {
                 let title = alert["title"] as? String ?? ""
                 let body = alert["body"] as? String ?? ""
-                LogManager.shared.log(category: .general, message: "Notification - Title: \(title), Body: \(body)")
+                LogManager.shared.log(category: .apns, message: "Notification - Title: \(title), Body: \(body)")
             }
 
             // Handle silent notification (content-available)
             if let contentAvailable = aps["content-available"] as? Int, contentAvailable == 1 {
                 // This is a silent push, nothing implemented but logging for now
 
                 if let commandStatus = userInfo["command_status"] as? String {
-                    LogManager.shared.log(category: .general, message: "Command status: \(commandStatus)")
+                    LogManager.shared.log(category: .apns, message: "Command status: \(commandStatus)")
                 }
 
                 if let commandType = userInfo["command_type"] as? String {
-                    LogManager.shared.log(category: .general, message: "Command type: \(commandType)")
+                    LogManager.shared.log(category: .apns, message: "Command type: \(commandType)")
                 }
             }
         }
@@ -97,6 +111,12 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         completionHandler(.newData)
     }
 
+    // MARK: - URL handling
+
+    // Note: with scene-based lifecycle (iOS 13+), URLs are delivered to
+    // SceneDelegate.scene(_:openURLContexts:) — not here. The scene delegate
+    // handles <urlScheme>://la-tap for Live Activity tap navigation.
+
     // MARK: UISceneSession Lifecycle
 
     func application(_: UIApplication, willFinishLaunchingWithOptions _: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
@@ -110,7 +130,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     func application(_: UIApplication, configurationForConnecting connectingSceneSession: UISceneSession, options _: UIScene.ConnectionOptions) -> UISceneConfiguration {
         // Called when a new scene session is being created.
         // Use this method to select a configuration to create the new scene with.
-        return UISceneConfiguration(name: "Default Configuration", sessionRole: connectingSceneSession.role)
+        UISceneConfiguration(name: "Default Configuration", sessionRole: connectingSceneSession.role)
     }
 
     func application(_: UIApplication, didDiscardSceneSessions _: Set<UISceneSession>) {
@@ -166,7 +186,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     func userNotificationCenter(_: UNUserNotificationCenter, didReceive response: UNNotificationResponse, withCompletionHandler completionHandler: @escaping () -> Void) {
         if response.actionIdentifier == "OPEN_APP_ACTION" {
-            if let window = window {
+            if let window {
                 window.rootViewController?.dismiss(animated: true, completion: nil)
                 window.rootViewController?.present(MainViewController(), animated: true, completion: nil)
             }

LoopFollow/Application/SceneDelegate.swift

@@ -34,6 +34,16 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
         // Use this method to restart any tasks that were paused (or not yet started) when the scene was inactive.
     }
 
+    func scene(_: UIScene, openURLContexts URLContexts: Set<UIOpenURLContext>) {
+        guard URLContexts.contains(where: { $0.url.scheme == AppGroupID.urlScheme && $0.url.host == "la-tap" }) else { return }
+        // scene(_:openURLContexts:) fires after sceneDidBecomeActive when the app
+        // foregrounds from background. Post on the next run loop so the view
+        // hierarchy (including any presented modals) is fully settled.
+        DispatchQueue.main.async {
+            NotificationCenter.default.post(name: .liveActivityDidForeground, object: nil)
+        }
+    }
+
     func sceneWillResignActive(_: UIScene) {
         // Called when the scene will move from an active state to an inactive state.
         // This may occur due to temporary interruptions (ex. an incoming phone call).
@@ -53,7 +63,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
         (UIApplication.shared.delegate as? AppDelegate)?.saveContext()
     }
 
-    // Handle the UIApplicationShortcutItem when the user taps on the Home Screen Quick Action. This function toggles the "Speak BG" setting in UserDefaultsRepository, speaks the current state (on/off) using AVSpeechSynthesizer, and updates the Quick Action appearance.
+    /// Handle the UIApplicationShortcutItem when the user taps on the Home Screen Quick Action. This function toggles the "Speak BG" setting in UserDefaultsRepository, speaks the current state (on/off) using AVSpeechSynthesizer, and updates the Quick Action appearance.
     func handleShortcutItem(_ shortcutItem: UIApplicationShortcutItem) {
         if let bundleIdentifier = Bundle.main.bundleIdentifier {
             let expectedType = bundleIdentifier + ".toggleSpeakBG"
@@ -66,7 +76,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
         }
     }
 
-    // The following method is called when the user taps on the Home Screen Quick Action
+    /// The following method is called when the user taps on the Home Screen Quick Action
     func windowScene(_: UIWindowScene, performActionFor shortcutItem: UIApplicationShortcutItem, completionHandler _: @escaping (Bool) -> Void) {
         handleShortcutItem(shortcutItem)
     }

LoopFollow/Controllers/BackgroundAlertManager.swift

@@ -11,11 +11,24 @@ enum BackgroundAlertDuration: TimeInterval, CaseIterable {
     case eighteenMinutes = 1080 // 18 minutes in seconds
 }
 
-/// Enum representing unique identifiers for each background alert.
-enum BackgroundAlertIdentifier: String, CaseIterable {
-    case sixMin = "loopfollow.background.alert.6min"
-    case twelveMin = "loopfollow.background.alert.12min"
-    case eighteenMin = "loopfollow.background.alert.18min"
+/// Unique identifiers for each background alert, scoped to the current bundle
+/// so multiple LoopFollow instances don't interfere with each other's notifications.
+enum BackgroundAlertIdentifier: CaseIterable {
+    case sixMin
+    case twelveMin
+    case eighteenMin
+
+    private static let prefix = Bundle.main.bundleIdentifier ?? "loopfollow"
+
+    var rawValue: String {
+        switch self {
+        case .sixMin: "\(Self.prefix).background.alert.6min"
+        case .twelveMin: "\(Self.prefix).background.alert.12min"
+        case .eighteenMin: "\(Self.prefix).background.alert.18min"
+        }
+    }
+
+    static let categoryIdentifier = "\(prefix).background.alert"
 }
 
 class BackgroundAlertManager {
@@ -118,7 +131,7 @@ class BackgroundAlertManager {
         content.title = title
         content.body = body
         content.sound = .defaultCritical
-        content.categoryIdentifier = "loopfollow.background.alert"
+        content.categoryIdentifier = BackgroundAlertIdentifier.categoryIdentifier
         return content
     }
 

LoopFollow/Controllers/Nightscout/BGData.swift

@@ -260,9 +260,19 @@ extension MainViewController {
                 Observable.shared.deltaText.value = "+" + Localizer.toDisplayUnits(String(deltaBG))
             }
 
+            // Live Activity storage
+            Storage.shared.lastBgReadingTimeSeconds.value = lastBGTime
+            Storage.shared.lastDeltaMgdl.value = Double(deltaBG)
+            Storage.shared.lastTrendCode.value = entries[latestEntryIndex].direction
+
             // Mark BG data as loaded for initial loading state
             self.markDataLoaded("bg")
 
+            // Live Activity update
+            #if !targetEnvironment(macCatalyst)
+                LiveActivityManager.shared.refreshFromCurrentState(reason: "bg")
+            #endif
+
             // Update contact
             if Storage.shared.contactEnabled.value {
                 self.contactImageUpdater

LoopFollow/Controllers/Nightscout/DeviceStatus.swift

@@ -46,6 +46,7 @@ extension MainViewController {
 
         if IsNightscoutEnabled(), (now - lastLoopTime) >= nonLoopingTimeThreshold, lastLoopTime > 0 {
             IsNotLooping = true
+            Observable.shared.isNotLooping.value = true
             statusStackView.distribution = .fill
 
             PredictionLabel.isHidden = true
@@ -55,9 +56,13 @@ extension MainViewController {
             LoopStatusLabel.text = "⚠️ Not Looping!"
             LoopStatusLabel.textColor = UIColor.systemYellow
             LoopStatusLabel.font = UIFont.boldSystemFont(ofSize: 18)
+            #if !targetEnvironment(macCatalyst)
+                LiveActivityManager.shared.refreshFromCurrentState(reason: "notLooping")
+            #endif
 
         } else {
             IsNotLooping = false
+            Observable.shared.isNotLooping.value = false
             statusStackView.distribution = .fillEqually
             PredictionLabel.isHidden = false
 
@@ -72,6 +77,9 @@ extension MainViewController {
             case .system:
                 LoopStatusLabel.textColor = UIColor.label
             }
+            #if !targetEnvironment(macCatalyst)
+                LiveActivityManager.shared.refreshFromCurrentState(reason: "loopingResumed")
+            #endif
         }
     }
 
@@ -119,14 +127,17 @@ extension MainViewController {
                 let storedTime = Observable.shared.alertLastLoopTime.value ?? 0
                 if lastPumpTime > storedTime {
                     Observable.shared.alertLastLoopTime.value = lastPumpTime
+                    Storage.shared.lastLoopTime.value = lastPumpTime
                 }
 
                 if let reservoirData = lastPumpRecord["reservoir"] as? Double {
                     latestPumpVolume = reservoirData
                     infoManager.updateInfoData(type: .pump, value: String(format: "%.0f", reservoirData) + "U")
+                    Storage.shared.lastPumpReservoirU.value = reservoirData
                 } else {
                     latestPumpVolume = 50.0
                     infoManager.updateInfoData(type: .pump, value: "50+U")
+                    Storage.shared.lastPumpReservoirU.value = nil
                 }
             }