Merge branch 'watch' of github.com:nightscout/Trio-dev into local-testing-02022025

Trio Watch App Extension/WatchState.swift

@@ -205,21 +205,34 @@ import WatchConnectivity
 
                     // Handle bolus progress updates
         } else if
+            let timestamp = message[WatchMessageKeys.bolusProgressTimestamp] as? TimeInterval,
             let progress = message[WatchMessageKeys.bolusProgress] as? Double,
             let activeBolusAmount = message[WatchMessageKeys.activeBolusAmount] as? Double,
             let deliveredAmount = message[WatchMessageKeys.deliveredAmount] as? Double
         {
-            DispatchQueue.main.async {
-                if !self.isBolusCanceled {
-                    self.bolusProgress = progress
+            let date = Date(timeIntervalSince1970: timestamp)
 
-                    // we only need to grab the active bolus amount from the phone if it is a phone-invoked bolus
-                    // when it comes from the watch, we already have it stored and available
-                    if self.activeBolusAmount == 0 {
-                        self.activeBolusAmount = activeBolusAmount
-                    }
+            // Check if it's not older than 5 min
+            if date >= Date().addingTimeInterval(-5 * 60) {
+                print("⌚️ Handling bolusProgress (sent at \(date))")
+                DispatchQueue.main.async {
+                    if !self.isBolusCanceled {
+                        self.bolusProgress = progress
+
+                        // we only need to grab the active bolus amount from the phone if it is a phone-invoked bolus
+                        // when it comes from the watch, we already have it stored and available
+                        if self.activeBolusAmount == 0 {
+                            self.activeBolusAmount = activeBolusAmount
+                        }
 
-                    self.deliveredAmount = deliveredAmount
+                        self.deliveredAmount = deliveredAmount
+                    }
+                }
+            } else {
+                print("⌚️ Received outdated bolus progress (sent at \(date))")
+                DispatchQueue.main.async {
+                    self.bolusProgress = 0
+                    self.activeBolusAmount = 0
                 }
             }
             return
@@ -289,19 +302,35 @@ import WatchConnectivity
 
                     // Handle bolus progress updates
         } else if
+            let timestamp = userInfo[WatchMessageKeys.bolusProgressTimestamp] as? TimeInterval,
             let progress = userInfo[WatchMessageKeys.bolusProgress] as? Double,
-            let activeBolusAmount = userInfo[WatchMessageKeys.activeBolusAmount] as? Double
+            let activeBolusAmount = userInfo[WatchMessageKeys.activeBolusAmount] as? Double,
+            let deliveredAmount = userInfo[WatchMessageKeys.deliveredAmount] as? Double
         {
-            DispatchQueue.main.async {
-                if !self.isBolusCanceled {
-                    self.bolusProgress = progress
+            let date = Date(timeIntervalSince1970: timestamp)
+
+            // Check if it's not older than 5 min
+            if date >= Date().addingTimeInterval(-5 * 60) {
+                print("⌚️ Handling bolusProgress (sent at \(date))")
+                DispatchQueue.main.async {
+                    if !self.isBolusCanceled {
+                        self.bolusProgress = progress
 
-                    // we only need to grab the active bolus amount from the phone if it is a phone-invoked bolus
-                    // when it comes from the watch, we already have it stored and available
-                    if self.activeBolusAmount == 0 {
-                        self.activeBolusAmount = activeBolusAmount
+                        // we only need to grab the active bolus amount from the phone if it is a phone-invoked bolus
+                        // when it comes from the watch, we already have it stored and available
+                        if self.activeBolusAmount == 0 {
+                            self.activeBolusAmount = activeBolusAmount
+                        }
+
+                        self.deliveredAmount = deliveredAmount
                     }
                 }
+            } else {
+                print("⌚️ Received outdated bolus progress (sent at \(date))")
+                DispatchQueue.main.async {
+                    self.bolusProgress = 0
+                    self.activeBolusAmount = 0
+                }
             }
             return
 

Trio/Sources/Models/WatchMessageKeys.swift

@@ -14,6 +14,7 @@ enum WatchMessageKeys {
     static let bolusProgress = "bolusProgress"
     static let activeBolusAmount = "activeBolusAmount"
     static let deliveredAmount = "deliveredAmount"
+    static let bolusProgressTimestamp = "bolusProgressTimestamp"
 
     // Recommendation Keys
     static let requestBolusRecommendation = "requestBolusRecommendation"

Trio/Sources/Services/WatchManager/AppleWatchManager.swift

@@ -923,6 +923,7 @@ final class BaseWatchManager: NSObject, WCSessionDelegate, Injectable, WatchMana
         guard let session = session, let progress = progress, let pumpManager = apsManager.pumpManager else { return }
 
         let message: [String: Any] = [
+            WatchMessageKeys.bolusProgressTimestamp: Date().timeIntervalSince1970,
             WatchMessageKeys.bolusProgress: Double(truncating: progress as NSNumber),
             WatchMessageKeys.activeBolusAmount: activeBolusAmount,
             WatchMessageKeys.deliveredAmount: pumpManager