Add remote commands via APNS for Loop users (#434)

* Add remote commands via APNS for Loop users

* Use already available overrides from ProfileManager for Loop APNS

* sha1 is no longer needed

* Removed CommonCrypto since it is not used.

* Undo change

* Revert APNS-related changes in Config.xcconfig from commit d5ce515

* Fix for loopapns setup not updating and reverting to default value

* Fix rounding for bolus confirm button

* Centralize jwt-management

* Use the sama apnskey, keyid and team storage as trio

* Remove stray references to loopAPNS variables

* Avoid publishing changes from within view updates for Loop APNS setup

* Align buttons with TRC

* Fix for crashing camera

* cleanup

* Cleanup

* Add countdown for Loop TOTP code

* Mitigate app hang when scanning or adding totp url

* Simplified validation

* Remove manual device token refresh and move debug info to main settings

* Add current totp code to debug / info section

* Conditionally enable Nightscout remote type based on if the user is using Trio

* Fix for devicetoken and bundleid missing

* Removed dead code

* Removed dead code

* Swapped the incorrect error invalidURL to invalidConfiguration

* Refactor OverridePresetsView to use alerts for success/error feedback instead of inline messages

* Fix typo

* Separate error for jwt token

* Merge settings for Loop and Trio

* Move guardrails up

* Cleanup

* Text adjustment

* Loop remote setup wll fail if team id is missing

* Use entire screen for message when loop apns setup is missing

* XCode auto format

* Restore accidently removed code

* Fix: Preserve APNS production setting when absent from profile on sync

* Refactor(UI): Correct navigation structure in RemoteSettingsView to fix header

* Fix label in Remote Settings to 'Loop Remote Control' for naming consistency

* Add current active override to Loop override screen

* Add time picker for carbs timing and fix absorption time with default emojis

* Fix multiline TextEditor Done button to dismiss keyboard instead of inserting newline

* Extract aps error message

* Moved down TRC below LRC

* Fix for showing errors correctly

* Extract Loop apns error data

* Reset to remote control type to none if the looping system is incorrect

* Use Random carb entry seconds to avoid NS issues reflecting carbs

* Revert accidental change to project.pbxproj

* rearrange items on Remote Settings screen

* modify import to enable building with Xcode 26 beta 4

* Add extra decimal to insulin input for pumps with more granular dosing

* Add better warnings for bolus recommendations

---------

Co-authored-by: Jonas Björkert <jonas@bjorkert.se>
Co-authored-by: marionbarker <marionbarker@earthlink.net>

Author: 3 people

.gitignore

@@ -80,3 +80,4 @@ fastlane/test_output
 fastlane/FastlaneRunner
 
 LoopFollowConfigOverride.xcconfig
+.history

LoopFollow.xcodeproj/project.pbxproj

@@ -131,7 +131,7 @@ struct Alarm: Identifiable, Codable, Equatable {
         }
 
         // Mute during calls
-        if !config.audioDuringCalls && isOnPhoneCall() {
+        if !config.audioDuringCalls, isOnPhoneCall() {
             playSound = false
         }
 

LoopFollow.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -8,7 +8,7 @@ import os
 import UIKit
 
 class BluetoothDevice: NSObject, CBCentralManagerDelegate, CBPeripheralDelegate {
-    public weak var bluetoothDeviceDelegate: BluetoothDeviceDelegate?
+    weak var bluetoothDeviceDelegate: BluetoothDeviceDelegate?
     private(set) var deviceAddress: String
     private(set) var deviceName: String?
     private let CBUUID_Advertisement: String?
@@ -158,7 +158,7 @@ class BluetoothDevice: NSObject, CBCentralManagerDelegate, CBPeripheralDelegate
         _ = startScanning()
     }
 
-    public func cancelConnectionTimer() {
+    func cancelConnectionTimer() {
         if let connectTimeOutTimer = connectTimeOutTimer {
             connectTimeOutTimer.invalidate()
             self.connectTimeOutTimer = nil

LoopFollow/Alarm/Alarm.swift

@@ -1771,34 +1771,90 @@ extension MainViewController {
         }
     }
 
+    func extractMessage(from logEntry: String) -> String? {
+        // Check if this is a JSON-containing log entry
+        guard let jsonStartIndex = logEntry.range(of: "{\"")?.lowerBound else {
+            return nil
+        }
+
+        // Extract the error message part (before JSON)
+        let errorMessage = String(logEntry[..<jsonStartIndex])
+            .trimmingCharacters(in: .whitespacesAndNewlines)
+
+        // Extract and parse JSON to get context
+        let jsonString = String(logEntry[jsonStartIndex...])
+        var actionContext = ""
+
+        if let jsonData = jsonString.data(using: .utf8),
+           let json = try? JSONSerialization.jsonObject(with: jsonData) as? [String: Any]
+        {
+            // Extract relevant action information
+            var actionParts: [String] = []
+
+            // Check for bolus entry
+            if let bolusAmount = json["bolus-entry"] as? Double {
+                actionParts.append("Bolus: \(bolusAmount) U")
+            }
+
+            // Check for carbs entry
+            if let carbsAmount = json["carbs-entry"] as? Double {
+                actionParts.append("Carbs: \(carbsAmount) g")
+            }
+
+            // Check for absorption time (relevant for carbs)
+            if let absorptionTime = json["absorption-time"] as? Double {
+                actionParts.append("Absorption: \(absorptionTime) hrs")
+            }
+
+            // Check for OTP (password)
+            if let otp = json["otp"] as? String {
+                actionParts.append("OTP: \(otp)")
+            }
+
+            // Check for sender
+            if let enteredBy = json["entered-by"] as? String {
+                actionParts.append("From: \(enteredBy)")
+            }
+
+            // Combine action parts
+            if !actionParts.isEmpty {
+                actionContext = " [" + actionParts.joined(separator: ", ") + "]"
+            }
+        }
+
+        // Combine error message with action context
+        let finalMessage = errorMessage + actionContext
+
+        return finalMessage.isEmpty ? nil : finalMessage
+    }
+
     func wrapText(_ text: String, maxLineLength: Int) -> String {
+        let messageToWrap = extractMessage(from: text) ?? text
+
         guard maxLineLength > 0 else {
-            return text
+            return messageToWrap
         }
 
         var result: [String] = []
-        let lines = text.components(separatedBy: .newlines)
+        let lines = messageToWrap.components(separatedBy: .newlines)
 
         for line in lines {
             var currentLine = ""
             let words = line.components(separatedBy: .whitespaces)
 
             for word in words {
-                // Handles words that are longer than a single line.
                 if word.count > maxLineLength {
                     if !currentLine.isEmpty {
                         result.append(currentLine)
                         currentLine = ""
                     }
-
                     var wordToSplit = word
                     while !wordToSplit.isEmpty {
                         let splitIndex = wordToSplit.index(wordToSplit.startIndex, offsetBy: min(maxLineLength, wordToSplit.count))
                         result.append(String(wordToSplit[..<splitIndex]))
                         wordToSplit = String(wordToSplit[splitIndex...])
                     }
                 } else {
-                    // The word fits on the line.
                     if currentLine.isEmpty {
                         currentLine = word
                     } else if currentLine.count + word.count + 1 <= maxLineLength {

LoopFollow/BackgroundRefresh/BT/BluetoothDevice.swift

@@ -109,14 +109,19 @@ final class ProfileManager {
             trioOverrides = []
         }
 
-        Storage.shared.deviceToken.value = profileData.deviceToken ?? ""
+        Storage.shared.deviceToken.value = profileData.deviceToken ?? profileData.loopSettings?.deviceToken ?? ""
+
         if let expirationDate = profileData.expirationDate {
             Storage.shared.expirationDate.value = NightscoutUtils.parseDate(expirationDate)
         } else {
             Storage.shared.expirationDate.value = nil
         }
-        Storage.shared.bundleId.value = profileData.bundleIdentifier ?? ""
-        Storage.shared.productionEnvironment.value = profileData.isAPNSProduction ?? false
+        Storage.shared.bundleId.value = profileData.bundleIdentifier ?? profileData.loopSettings?.bundleIdentifier ?? ""
+
+        if let isProduction = profileData.isAPNSProduction {
+            Storage.shared.productionEnvironment.value = isProduction
+        }
+
         Storage.shared.teamId.value = profileData.teamID ?? Storage.shared.teamId.value ?? ""
     }
 

LoopFollow/Controllers/Graphs.swift

@@ -19,7 +19,7 @@ extension HKUnit {
         case .millimolesPerLiter:
             return 1
         case .internationalUnit():
-            return 2
+            return 3
         default:
             return 0
         }

LoopFollow/Controllers/Nightscout/ProfileManager.swift

@@ -0,0 +1,31 @@
+// LoopFollow
+// DateExtensions.swift
+// Created by codebymini.
+
+import Foundation
+
+// MARK: - Date Extension for NS Compatibility
+
+extension Date {
+    /// Creates a new date with the original date's components but current seconds and milliseconds
+    /// This prevents Nightscout issues with entries at the same exact time
+    /// - Returns: A new date with randomized milliseconds
+    func dateUsingCurrentSeconds() -> Date {
+        let calendar = Calendar.current
+
+        // Extracting components from the original date
+        var components = calendar.dateComponents([.year, .month, .day, .hour, .minute], from: self)
+
+        // Getting the current seconds and milliseconds
+        let now = Date()
+        let nowSeconds = calendar.component(.second, from: now)
+        let nowMillisecond = calendar.component(.nanosecond, from: now) / 1_000_000
+
+        // Setting the seconds and millisecond components
+        components.second = nowSeconds
+        components.nanosecond = nowMillisecond * 1_000_000
+
+        // Creating a new date with these components
+        return calendar.date(from: components) ?? self
+    }
+}

LoopFollow/Extensions/HKUnit+Extensions.swift

@@ -0,0 +1,53 @@
+// LoopFollow
+// JWTManager.swift
+// Created by Jonas Björkert.
+
+import Foundation
+import SwiftJWT
+
+struct JWTClaims: Claims {
+    let iss: String
+    let iat: Date
+}
+
+class JWTManager {
+    static let shared = JWTManager()
+
+    private init() {}
+
+    func getOrGenerateJWT(keyId: String, teamId: String, apnsKey: String) -> String? {
+        // 1. Check for a valid, non-expired JWT directly from Storage.shared
+        if let jwt = Storage.shared.cachedJWT.value,
+           let expiration = Storage.shared.jwtExpirationDate.value,
+           Date() < expiration
+        {
+            return jwt
+        }
+
+        // 2. If no valid JWT is found, generate a new one
+        let header = Header(kid: keyId)
+        let claims = JWTClaims(iss: teamId, iat: Date())
+        var jwt = JWT(header: header, claims: claims)
+
+        do {
+            let privateKey = Data(apnsKey.utf8)
+            let jwtSigner = JWTSigner.es256(privateKey: privateKey)
+            let signedJWT = try jwt.sign(using: jwtSigner)
+
+            // 3. Save the new JWT and its expiration date directly to Storage.shared
+            Storage.shared.cachedJWT.value = signedJWT
+            Storage.shared.jwtExpirationDate.value = Date().addingTimeInterval(3600) // Expires in 1 hour
+
+            return signedJWT
+        } catch {
+            LogManager.shared.log(category: .apns, message: "Failed to sign JWT: \(error.localizedDescription)")
+            return nil
+        }
+    }
+
+    // Invalidate the cache by clearing values in Storage.shared
+    func invalidateCache() {
+        Storage.shared.cachedJWT.value = nil
+        Storage.shared.jwtExpirationDate.value = nil
+    }
+}