set initial expirationReminderDate after priming

ps2 · Apr 12, 2019 · 9d21f33 · 9d21f33
1 parent 97acf9d
commit 9d21f33
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/OmniKit/PumpManager/OmnipodPumpManager.swift b/OmniKit/PumpManager/OmnipodPumpManager.swift
@@ -358,7 +358,6 @@ public class OmnipodPumpManager: RileyLinkPumpManager, PumpManager {
 
     public weak var pumpManagerDelegate: PumpManagerDelegate? {
         didSet {
-            pumpManagerDelegate?.clearNotification(for: self, identifier: LoopNotificationCategory.pumpExpirationWarning.rawValue)
             self.queue.async {
                 self.clearPodExpirationNotification()
                 self.schedulePodExpirationNotification()
@@ -536,17 +535,11 @@ public class OmnipodPumpManager: RileyLinkPumpManager, PumpManager {
                 return
             }
 
-            guard let podState = self.state.podState else {
-                completion(.failure(OmnipodPumpManagerError.noPodPaired))
-                return
-            }
-
             self.podComms.runSession(withName: "Configure and prime pod", using: deviceSelector) { (result) in
                 switch result {
                 case .success(let session):
                     do {
                         let primeFinishedAt = try session.prime()
-                        self.state.expirationReminderDate = podState.expiresAt?.addingTimeInterval(-Pod.expirationReminderAlertDefaultTimeBeforeExpiration)
                         completion(.success(primeFinishedAt))
                     } catch let error {
                         completion(.failure(error))
@@ -578,12 +571,14 @@ public class OmnipodPumpManager: RileyLinkPumpManager, PumpManager {
 
         queue.async {
 
-            guard let podState = self.state.podState, podState.readyForCannulaInsertion else
+            guard let podState = self.state.podState, let expiresAt = podState.expiresAt, podState.readyForCannulaInsertion else
             {
                 completion(.failure(OmnipodPumpManagerError.notReadyForCannulaInsertion))
                 return
             }
-
+
+            self.expirationReminderDate = expiresAt.addingTimeInterval(-Pod.expirationReminderAlertDefaultTimeBeforeExpiration)
+
             guard podState.setupProgress.needsCannulaInsertion else {
                 completion(.failure(OmnipodPumpManagerError.podAlreadyPaired))
                 return

diff --git a/OmniKit/PumpManager/PodState.swift b/OmniKit/PumpManager/PodState.swift
@@ -134,6 +134,9 @@ public struct PodState: RawRepresentable, Equatable, CustomDebugStringConvertibl
     }
 
     public mutating func updateFromStatusResponse(_ response: StatusResponse) {
+        if activatedAt == nil {
+            self.activatedAt = Date() - response.timeActive
+        }
         updateDeliveryStatus(deliveryStatus: response.deliveryStatus)
         lastInsulinMeasurements = PodInsulinMeasurements(statusResponse: response, validTime: Date())
         activeAlertSlots = response.alerts
@@ -215,7 +218,6 @@ public struct PodState: RawRepresentable, Equatable, CustomDebugStringConvertibl
             let address = rawValue["address"] as? UInt32,
             let nonceStateRaw = rawValue["nonceState"] as? NonceState.RawValue,
             let nonceState = NonceState(rawValue: nonceStateRaw),
-            let activatedAt = rawValue["activatedAt"] as? Date,
             let piVersion = rawValue["piVersion"] as? String,
             let pmVersion = rawValue["pmVersion"] as? String,
             let lot = rawValue["lot"] as? UInt32,
@@ -226,12 +228,16 @@ public struct PodState: RawRepresentable, Equatable, CustomDebugStringConvertibl
 
         self.address = address
         self.nonceState = nonceState
-        self.activatedAt = activatedAt
         self.piVersion = piVersion
         self.pmVersion = pmVersion
         self.lot = lot
         self.tid = tid
-
+
+
+        if let activatedAt = rawValue["activatedAt"] as? Date {
+            self.activatedAt = activatedAt
+        }
+
         if let suspended = rawValue["suspended"] as? Bool {
             self.suspended = suspended
         } else {