LOOP-4093 Infer delivered loop-not-looping notifications on app becoming active (#508)

* Infer delivered loop-not-looping notifications on app becoming active

* Update tests

Author: ps2

Loop/Managers/LoopAlertsManager.swift

@@ -134,10 +134,10 @@ public class LoopAlertsManager {
         UserDefaults.appGroup?.loopNotRunningNotifications = scheduledNotifications
     }
 
-    func clearLoopNotRunningNotifications() {
-
-        // Any past alerts have been delivered at this point
+    func inferDeliveredLoopNotRunningNotifications() {
+        // Infer that any past alerts have been delivered at this point
         let now = getCurrentDate()
+        var stillPendingNotifications = [StoredLoopNotRunningNotification]()
         for notification in UserDefaults.appGroup?.loopNotRunningNotifications ?? [] {
             print("Comparing alert \(notification.alertAt) to \(now) (real date = \(Date())")
             if notification.alertAt < now {
@@ -146,10 +146,15 @@ public class LoopAlertsManager {
                 let interruptionLevel: Alert.InterruptionLevel = notification.isCritical ? .critical : .timeSensitive
                 let alert = Alert(identifier: alertIdentifier, foregroundContent: nil, backgroundContent: content, trigger: .immediate, interruptionLevel: interruptionLevel)
                 alertManager.recordIssued(alert: alert, at: notification.alertAt)
+            } else {
+                stillPendingNotifications.append(notification)
             }
         }
+        UserDefaults.appGroup?.loopNotRunningNotifications = stillPendingNotifications
+    }
 
-        UserDefaults.appGroup?.loopNotRunningNotifications = []
+    func clearLoopNotRunningNotifications() {
+        inferDeliveredLoopNotRunningNotifications()
 
         // Clear out any existing not-running notifications
         UNUserNotificationCenter.current().getDeliveredNotifications { (notifications) in

Loop/Managers/LoopAppManager.swift

@@ -243,6 +243,7 @@ class LoopAppManager: NSObject {
             ProfileExpirationAlerter.alertIfNeeded(viewControllerToPresentFrom: rootViewController)
         }
         deviceDataManager?.didBecomeActive()
+        loopAlertsManager.inferDeliveredLoopNotRunningNotifications()
     }
 
     // MARK: - Remote Notification

LoopTests/Managers/Alerts/LoopAlertManagerTests.swift

@@ -68,29 +68,29 @@ class LoopAlertManagerTests: XCTestCase {
         XCTAssertEqual(4, UserDefaults.appGroup?.loopNotRunningNotifications.count)
     }
 
-    func testLoopDidCompleteAfter10MinutesDoesNotRecordAlert() {
+    func testLoopFailureFor10MinutesDoesNotRecordAlert() {
         loopAlertsManager.loopDidComplete()
         XCTAssertNil(mockAlertStore.issuedAlert)
         loopAlertsManager.getCurrentDate = { return Date().addingTimeInterval(.minutes(10))}
-        loopAlertsManager.loopDidComplete()
+        loopAlertsManager.inferDeliveredLoopNotRunningNotifications()
         XCTAssertNil(mockAlertStore.issuedAlert)
     }
 
-    func testLoopDidCompleteAfter30MinutesRecordsTimeSensitiveAlert() {
+    func testLoopFailureFor30MinutesRecordsTimeSensitiveAlert() {
         loopAlertsManager.loopDidComplete()
         XCTAssertNil(mockAlertStore.issuedAlert)
         loopAlertsManager.getCurrentDate = { return Date().addingTimeInterval(.minutes(30))}
-        loopAlertsManager.loopDidComplete()
-        XCTAssertEqual(4, UserDefaults.appGroup?.loopNotRunningNotifications.count)
+        loopAlertsManager.inferDeliveredLoopNotRunningNotifications()
+        XCTAssertEqual(3, UserDefaults.appGroup?.loopNotRunningNotifications.count)
         XCTAssertNotNil(mockAlertStore.issuedAlert)
         XCTAssertEqual(.timeSensitive, mockAlertStore.issuedAlert!.interruptionLevel)
     }
 
-    func testLoopDidCompleteAfter30MinutesRecordsCriticalAlert() {
+    func testLoopFailureFor65MinutesRecordsCriticalAlert() {
         loopAlertsManager.loopDidComplete()
         loopAlertsManager.getCurrentDate = { return Date().addingTimeInterval(.minutes(65))}
-        loopAlertsManager.loopDidComplete()
-        XCTAssertEqual(4, UserDefaults.appGroup?.loopNotRunningNotifications.count)
+        loopAlertsManager.inferDeliveredLoopNotRunningNotifications()
+        XCTAssertEqual(1, UserDefaults.appGroup?.loopNotRunningNotifications.count)
         XCTAssertNotNil(mockAlertStore.issuedAlert)
         XCTAssertEqual(.critical, mockAlertStore.issuedAlert!.interruptionLevel)
     }