Make expiresAt persistent & adjustable based on Pod time and activatedAt fixed again

OmniKit/PumpManager/OmnipodPumpManager.swift

@@ -465,6 +465,7 @@ extension OmnipodPumpManager {
         var podState = PodState(address: address, piVersion: "jumpstarted", pmVersion: "jumpstarted", lot: lot, tid: tid)
         podState.setupProgress = .podConfigured
         podState.activatedAt = start
+        podState.expiresAt = start + .hours(72)
 
         let fault = mockFault ? try? PodInfoFaultEvent(encodedData: Data(hexadecimalString: "020d0000000e00c36a020703ff020900002899080082")!) : nil
         podState.fault = fault

OmniKit/PumpManager/PodState.swift

@@ -42,11 +42,9 @@ public struct PodState: RawRepresentable, Equatable, CustomDebugStringConvertibl
 
     public let address: UInt32
     fileprivate var nonceState: NonceState
-    public var activatedAt: Date? // set based on StatusResponse timeActive and can change due to Pod clock drift and/or a system time change
 
-    public var expiresAt: Date? {
-        return activatedAt?.addingTimeInterval(Pod.serviceDuration - Pod.endOfServiceImminentWindow - Pod.expirationAdvisoryWindow)
-    }
+    public var activatedAt: Date?
+    public var expiresAt: Date?  // set based on StatusResponse timeActive and can change with Pod clock drift and/or system time change
 
     public let piVersion: String
     public let pmVersion: String
@@ -148,12 +146,15 @@ public struct PodState: RawRepresentable, Equatable, CustomDebugStringConvertibl
         let activatedAtComputed = now - response.timeActive
         if activatedAt == nil {
             self.activatedAt = activatedAtComputed
-        } else if let currActivatedAt = self.activatedAt,
-          (activatedAtComputed < currActivatedAt || activatedAtComputed > currActivatedAt + TimeInterval(minutes: 1)) {
-            // The computed activatedAt time is earlier than or more than a minute later than the current activatedAt time,
-            // so use the computed activatedAt time instead to handle Pod clock drift and/or system time changes issues.
-            // The more than a minute later test prevents oscillation of activatedAt based on the timing of the responses.
-            self.activatedAt = activatedAtComputed
+        }
+        let expiresAtComputed = activatedAtComputed + (Pod.serviceDuration - Pod.endOfServiceImminentWindow - Pod.expirationAdvisoryWindow)
+        if expiresAt == nil {
+            self.expiresAt = expiresAtComputed
+        } else if expiresAtComputed < self.expiresAt! || expiresAtComputed > (self.expiresAt! + TimeInterval(minutes: 1)) {
+            // The computed expiresAt time is earlier than or more than a minute later than the current expiresAt time,
+            // so use the computed expiresAt time instead to handle Pod clock drift and/or system time changes issues.
+            // The more than a minute later test prevents oscillation of expiresAt based on the timing of the responses.
+            self.expiresAt = expiresAtComputed
         }
         updateDeliveryStatus(deliveryStatus: response.deliveryStatus)
         lastInsulinMeasurements = PodInsulinMeasurements(statusResponse: response, validTime: now)
@@ -254,6 +255,11 @@ public struct PodState: RawRepresentable, Equatable, CustomDebugStringConvertibl
 
         if let activatedAt = rawValue["activatedAt"] as? Date {
             self.activatedAt = activatedAt
+            if let expiresAt = rawValue["expiresAt"] as? Date {
+                self.expiresAt = expiresAt
+            } else {
+                self.expiresAt = activatedAt + (Pod.serviceDuration - Pod.endOfServiceImminentWindow - Pod.expirationAdvisoryWindow)
+            }
         }
 
         if let suspended = rawValue["suspended"] as? Bool {
@@ -398,6 +404,10 @@ public struct PodState: RawRepresentable, Equatable, CustomDebugStringConvertibl
             rawValue["activatedAt"] = activatedAt
         }
 
+        if let expiresAt = expiresAt {
+            rawValue["expiresAt"] = expiresAt
+        }
+
         if configuredAlerts.count > 0 {
             let rawConfiguredAlerts = Dictionary(uniqueKeysWithValues:
                 configuredAlerts.map { slot, alarm in (String(describing: slot.rawValue), alarm.rawValue) })