Merge pull request #198 from loudnate/ios10

iOS 10

Author: loudnate

Loop.xcodeproj/project.pbxproj

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import UserNotifications
 import CarbKit
 import InsulinKit
 
@@ -20,7 +21,7 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
         window?.tintColor = UIColor.tintColor
 
-        NotificationManager.authorize()
+        NotificationManager.authorize(delegate: self)
 
         AnalyticsManager.sharedManager.application(application, didFinishLaunchingWithOptions: launchOptions)
 
@@ -60,27 +61,25 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
 
     }
 
-    // MARK: - Notifications
+    // MARK: - 3D Touch
 
-    func application(_ application: UIApplication, didReceive notification: UILocalNotification) {
-        if application.applicationState == .active {
-            if let message = notification.alertBody {
-                window?.rootViewController?.presentAlertController(withTitle: notification.alertTitle, message: message, animated: true, completion: nil)
-            }
-        }
+    func application(_ application: UIApplication, performActionFor shortcutItem: UIApplicationShortcutItem, completionHandler: @escaping (Bool) -> Void) {
+        completionHandler(false)
     }
+}
 
-    func application(_ application: UIApplication, handleActionWithIdentifier identifier: String?, for notification: UILocalNotification, withResponseInfo responseInfo: [AnyHashable: Any], completionHandler: @escaping () -> Void) {
 
-        switch identifier {
-        case NotificationManager.Action.RetryBolus.rawValue?:
-            if  let units = notification.userInfo?[NotificationManager.UserInfoKey.BolusAmount.rawValue] as? Double,
-                let startDate = notification.userInfo?[NotificationManager.UserInfoKey.BolusStartDate.rawValue] as? Date,
+extension AppDelegate: UNUserNotificationCenterDelegate {
+    func userNotificationCenter(_ center: UNUserNotificationCenter, didReceive response: UNNotificationResponse, withCompletionHandler completionHandler: @escaping () -> Void) {
+        switch response.actionIdentifier {
+        case NotificationManager.Action.RetryBolus.rawValue:
+            if  let units = response.notification.request.content.userInfo[NotificationManager.UserInfoKey.BolusAmount.rawValue] as? Double,
+                let startDate = response.notification.request.content.userInfo[NotificationManager.UserInfoKey.BolusStartDate.rawValue] as? Date,
                 startDate.timeIntervalSinceNow >= TimeInterval(minutes: -5)
             {
                 AnalyticsManager.sharedManager.didRetryBolus()
 
-                dataManager.enactBolus(units) { (error) in
+                dataManager.enactBolus(units: units) { (error) in
                     if error != nil {
                         NotificationManager.sendBolusFailureNotificationForAmount(units, atStartDate: startDate)
                     }
@@ -92,13 +91,11 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
         default:
             break
         }
-
+        
         completionHandler()
     }
 
-    // MARK: - 3D Touch
-
-    func application(_ application: UIApplication, performActionFor shortcutItem: UIApplicationShortcutItem, completionHandler: @escaping (Bool) -> Void) {
-        completionHandler(false)
+    func userNotificationCenter(_ center: UNUserNotificationCenter, willPresent notification: UNNotification, withCompletionHandler completionHandler: @escaping (UNNotificationPresentationOptions) -> Void) {
+        completionHandler([.badge, .sound, .alert])
     }
 }

Loop/AppDelegate.swift

@@ -114,7 +114,7 @@ final class DeviceDataManager: CarbStoreDelegate, DoseStoreDelegate, Transmitter
         AnalyticsManager.sharedManager.didChangeRileyLinkConnectionState()
 
         if connectedPeripheralIDs.count == 0 {
-            NotificationManager.clearLoopNotRunningNotifications()
+            NotificationManager.clearPendingNotificationRequests()
         }
     }
 
@@ -360,13 +360,12 @@ final class DeviceDataManager: CarbStoreDelegate, DoseStoreDelegate, Transmitter
         }
     }
 
-    /**
-     Send a bolus command and handle the result
- 
-     - parameter completion: A closure called after the command is complete. This closure takes a single argument:
-        - error: An error describing why the command failed
-     */
-    func enactBolus(_ units: Double, completion: @escaping (_ error: Error?) -> Void) {
+    /// Send a bolus command and handle the result
+    ///
+    /// - parameter units:      The number of units to deliver
+    /// - parameter completion: A clsure called after the command is complete. This closure takes a single argument:
+    ///     - error: An error describing why the command failed
+    func enactBolus(units: Double, completion: @escaping (_ error: Error?) -> Void) {
         guard units > 0 else {
             completion(nil)
             return
@@ -442,9 +441,7 @@ final class DeviceDataManager: CarbStoreDelegate, DoseStoreDelegate, Transmitter
     }
 
     // MARK: - G5 Transmitter
-    /**
-     The G5 transmitter is a reliable heartbeat by which we can assert the loop state.
-     */
+    /// The G5 transmitter is a reliable heartbeat by which we can assert the loop state.
 
     // MARK: TransmitterDelegate
 

Loop/Extensions/NSDate.swift renamed to Loop/Extensions/Data.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import UserNotifications
 
 
 struct NotificationManager {
@@ -27,74 +28,72 @@ struct NotificationManager {
         case BolusStartDate
     }
 
-    static var userNotificationSettings: UIUserNotificationSettings {
-        let retryBolusAction = UIMutableUserNotificationAction()
-        retryBolusAction.title = NSLocalizedString("Retry", comment: "The title of the notification action to retry a bolus command")
-        retryBolusAction.identifier = Action.RetryBolus.rawValue
-        retryBolusAction.activationMode = .background
-
-        let bolusFailureCategory = UIMutableUserNotificationCategory()
-        bolusFailureCategory.identifier = Category.BolusFailure.rawValue
-        bolusFailureCategory.setActions([
-                retryBolusAction
-            ],
-            for: .default
-        )
+    private static var notificationCategories: Set<UNNotificationCategory> {
+        var categories = [UNNotificationCategory]()
 
-        return UIUserNotificationSettings(
-            types: [.badge, .sound, .alert],
-            categories: [
-                bolusFailureCategory
-            ]
+        let retryBolusAction = UNNotificationAction(
+            identifier: Action.RetryBolus.rawValue,
+            title: NSLocalizedString("Retry", comment: "The title of the notification action to retry a bolus command"),
+            options: []
         )
+
+        categories.append(UNNotificationCategory(
+            identifier: Category.BolusFailure.rawValue,
+            actions: [retryBolusAction],
+            intentIdentifiers: [],
+            options: []
+        ))
+
+        return Set(categories)
     }
 
-    static func authorize() {
-        UIApplication.shared.registerUserNotificationSettings(userNotificationSettings)
+    static func authorize(delegate: UNUserNotificationCenterDelegate) {
+        let center = UNUserNotificationCenter.current()
+
+        center.delegate = delegate
+        center.requestAuthorization(options: [.badge, .sound, .alert], completionHandler: { _, _ in })
+        center.setNotificationCategories(notificationCategories)
     }
 
     // MARK: - Notifications
 
     static func sendBolusFailureNotificationForAmount(_ units: Double, atStartDate startDate: Date) {
-        let notification = UILocalNotification()
+        let notification = UNMutableNotificationContent()
 
-        notification.alertTitle = NSLocalizedString("Bolus", comment: "The notification title for a bolus failure")
-        notification.alertBody = String(format: NSLocalizedString("%@ U bolus may have failed.", comment: "The notification alert describing a possible bolus failure. The substitution parameter is the size of the bolus in units."), NumberFormatter.localizedString(from: NSNumber(value: units), number: .decimal))
-        notification.soundName = UILocalNotificationDefaultSoundName
+        notification.title = NSLocalizedString("Bolus", comment: "The notification title for a bolus failure")
+        notification.body = String(format: NSLocalizedString("%@ U bolus may have failed.", comment: "The notification alert describing a possible bolus failure. The substitution parameter is the size of the bolus in units."), NumberFormatter.localizedString(from: NSNumber(value: units), number: .decimal))
+        notification.sound = UNNotificationSound.default()
 
         if startDate.timeIntervalSinceNow >= TimeInterval(minutes: -5) {
-            notification.category = Category.BolusFailure.rawValue
+            notification.categoryIdentifier = Category.BolusFailure.rawValue
         }
 
         notification.userInfo = [
             UserInfoKey.BolusAmount.rawValue: units,
             UserInfoKey.BolusStartDate.rawValue: startDate
         ]
 
-        UIApplication.shared.presentLocalNotificationNow(notification)
+        let request = UNNotificationRequest(
+            // Only support 1 bolus notification at once
+            identifier: Category.BolusFailure.rawValue,
+            content: notification,
+            trigger: nil
+        )
+
+        UNUserNotificationCenter.current().add(request)
     }
 
     // Cancel any previous scheduled notifications in the Loop Not Running category
-    static func clearLoopNotRunningNotifications() {
-        let app = UIApplication.shared
-
-        app.scheduledLocalNotifications?.filter({
-            $0.category == Category.LoopNotRunning.rawValue
-        }).forEach({
-            app.cancelLocalNotification($0)
-        })
+    static func clearPendingNotificationRequests() {
+        UNUserNotificationCenter.current().removeAllPendingNotificationRequests()
     }
 
     static func scheduleLoopNotRunningNotifications() {
-        let app = UIApplication.shared
-
-        clearLoopNotRunningNotifications()
-
         // Give a little extra time for a loop-in-progress to complete
         let gracePeriod = TimeInterval(minutes: 0.5)
 
         for minutes: Double in [20, 40, 60, 120] {
-            let notification = UILocalNotification()
+            let notification = UNMutableNotificationContent()
             let failureInterval = TimeInterval(minutes: minutes)
 
             let formatter = DateComponentsFormatter()
@@ -103,46 +102,66 @@ struct NotificationManager {
             formatter.unitsStyle = .full
 
             if let failueIntervalString = formatter.string(from: failureInterval)?.localizedLowercase {
-                notification.alertBody = String(format: NSLocalizedString("Loop has not completed successfully in %@", comment: "The notification alert describing a long-lasting loop failure. The substitution parameter is the time interval since the last loop"), failueIntervalString)
+                notification.body = String(format: NSLocalizedString("Loop has not completed successfully in %@", comment: "The notification alert describing a long-lasting loop failure. The substitution parameter is the time interval since the last loop"), failueIntervalString)
             }
 
-            notification.alertTitle = NSLocalizedString("Loop Failure", comment: "The notification title for a loop failure")
-            notification.fireDate = Date(timeIntervalSinceNow: failureInterval + gracePeriod)
-            notification.soundName = UILocalNotificationDefaultSoundName
-            notification.category = Category.LoopNotRunning.rawValue
-
-            app.scheduleLocalNotification(notification)
+            notification.title = NSLocalizedString("Loop Failure", comment: "The notification title for a loop failure")
+            notification.sound = UNNotificationSound.default()
+            notification.categoryIdentifier = Category.LoopNotRunning.rawValue
+            notification.threadIdentifier = Category.LoopNotRunning.rawValue
+
+            let request = UNNotificationRequest(
+                identifier: "\(Category.LoopNotRunning.rawValue)\(failureInterval)",
+                content: notification,
+                trigger: UNTimeIntervalNotificationTrigger(
+                    timeInterval: failureInterval + gracePeriod,
+                    repeats: false
+                )
+            )
+
+            UNUserNotificationCenter.current().add(request)
         }
     }
 
     static func sendPumpBatteryLowNotification() {
-        let notification = UILocalNotification()
+        let notification = UNMutableNotificationContent()
+
+        notification.title = NSLocalizedString("Pump Battery Low", comment: "The notification title for a low pump battery")
+        notification.body = NSLocalizedString("Change the pump battery immediately", comment: "The notification alert describing a low pump battery")
+        notification.sound = UNNotificationSound.default()
+        notification.categoryIdentifier = Category.PumpBatteryLow.rawValue
 
-        notification.alertTitle = NSLocalizedString("Pump Battery Low", comment: "The notification title for a low pump battery")
-        notification.alertBody = NSLocalizedString("Change the pump battery immediately", comment: "The notification alert describing a low pump battery")
-        notification.soundName = UILocalNotificationDefaultSoundName
-        notification.category = Category.PumpBatteryLow.rawValue
+        let request = UNNotificationRequest(
+            identifier: Category.PumpBatteryLow.rawValue,
+            content: notification,
+            trigger: nil
+        )
 
-        UIApplication.shared.presentLocalNotificationNow(notification)
+        UNUserNotificationCenter.current().add(request)
     }
 
     static func sendPumpReservoirEmptyNotification() {
-        let notification = UILocalNotification()
-
-        notification.alertTitle = NSLocalizedString("Pump Reservoir Empty", comment: "The notification title for an empty pump reservoir")
-        notification.alertBody = NSLocalizedString("Change the pump reservoir now", comment: "The notification alert describing an empty pump reservoir")
-        notification.soundName = UILocalNotificationDefaultSoundName
-        notification.category = Category.PumpReservoirEmpty.rawValue
-
-        // TODO: Add an action to Suspend the pump
+        let notification = UNMutableNotificationContent()
+
+        notification.title = NSLocalizedString("Pump Reservoir Empty", comment: "The notification title for an empty pump reservoir")
+        notification.body = NSLocalizedString("Change the pump reservoir now", comment: "The notification alert describing an empty pump reservoir")
+        notification.sound = UNNotificationSound.default()
+        notification.categoryIdentifier = Category.PumpReservoirEmpty.rawValue
+
+        let request = UNNotificationRequest(
+            // Not a typo: this should replace any pump reservoir low notifications
+            identifier: Category.PumpReservoirLow.rawValue,
+            content: notification,
+            trigger: nil
+        )
 
-        UIApplication.shared.presentLocalNotificationNow(notification)
+        UNUserNotificationCenter.current().add(request)
     }
 
     static func sendPumpReservoirLowNotificationForAmount(_ units: Double, andTimeRemaining remaining: TimeInterval?) {
-        let notification = UILocalNotification()
+        let notification = UNMutableNotificationContent()
 
-        notification.alertTitle = NSLocalizedString("Pump Reservoir Low", comment: "The notification title for a low pump reservoir")
+        notification.title = NSLocalizedString("Pump Reservoir Low", comment: "The notification title for a low pump reservoir")
 
         let unitsString = NumberFormatter.localizedString(from: NSNumber(value: units), number: .decimal)
 
@@ -154,14 +173,20 @@ struct NotificationManager {
         intervalFormatter.includesTimeRemainingPhrase = true
 
         if let remaining = remaining, let timeString = intervalFormatter.string(from: remaining) {
-            notification.alertBody = String(format: NSLocalizedString("%1$@ U left: %2$@", comment: "Low reservoir alert with time remaining format string. (1: Number of units remaining)(2: approximate time remaining)"), unitsString, timeString)
+            notification.body = String(format: NSLocalizedString("%1$@ U left: %2$@", comment: "Low reservoir alert with time remaining format string. (1: Number of units remaining)(2: approximate time remaining)"), unitsString, timeString)
         } else {
-            notification.alertBody = String(format: NSLocalizedString("%1$@ U left", comment: "Low reservoir alert format string. (1: Number of units remaining)"), unitsString)
+            notification.body = String(format: NSLocalizedString("%1$@ U left", comment: "Low reservoir alert format string. (1: Number of units remaining)"), unitsString)
         }
 
-        notification.soundName = UILocalNotificationDefaultSoundName
-        notification.category = Category.PumpReservoirLow.rawValue
+        notification.sound = UNNotificationSound.default()
+        notification.categoryIdentifier = Category.PumpReservoirLow.rawValue
+
+        let request = UNNotificationRequest(
+            identifier: Category.PumpReservoirLow.rawValue,
+            content: notification,
+            trigger: nil
+        )
 
-        UIApplication.shared.presentLocalNotificationNow(notification)
+        UNUserNotificationCenter.current().add(request)
     }
 }

Loop/Extensions/NSData.swift

@@ -160,7 +160,7 @@ final class WatchDataManager: NSObject, WCSessionDelegate {
             }
         case SetBolusUserInfo.name?:
             if let bolus = SetBolusUserInfo(rawValue: message as SetBolusUserInfo.RawValue) {
-                self.deviceDataManager.enactBolus(bolus.value) { (error) in
+                self.deviceDataManager.enactBolus(units: bolus.value) { (error) in
                     if error != nil {
                         NotificationManager.sendBolusFailureNotificationForAmount(bolus.value, atStartDate: bolus.startDate)
                     } else {