Fix notifications and retry for bolus errors (#458)

Author: ps2

Loop/Managers/DeviceDataManager.swift

@@ -683,9 +683,18 @@ extension DeviceDataManager {
         pumpManager.enactBolus(units: units, automatic: automatic) { (error) in
             if let error = error {
                 self.log.error("%{public}@", String(describing: error))
-                if case .uncertainDelivery = error, !automatic {
-                    NotificationManager.sendBolusFailureNotification(for: error, units: units, at: Date())
+                
+                switch error {
+                case .uncertainDelivery:
+                    // Do not generate notification on uncertain delivery error
+                    break
+                default:
+                    // Do not generate notifications for automatic boluses that fail.
+                    if !automatic {
+                        NotificationManager.sendBolusFailureNotification(for: error, units: units, at: Date())
+                    }
                 }
+                
                 self.loopManager.bolusRequestFailed(error) {
                     completion(error)
                 }

Loop/Managers/LoopAppManager.swift

@@ -417,7 +417,9 @@ extension LoopAppManager: UNUserNotificationCenterDelegate {
                 deviceDataManager?.analyticsServicesManager.didRetryBolus()
 
                 deviceDataManager?.enactBolus(units: units, automatic: false) { (_) in
-                    completionHandler()
+                    DispatchQueue.main.async {
+                        completionHandler()
+                    }
                 }
                 return
             }

Loop/Managers/WatchDataManager.swift

@@ -366,7 +366,7 @@ final class WatchDataManager: NSObject {
                 return
             }
 
-            deviceManager.enactBolus(units: bolus.value, automatic: true) { (error) in
+            deviceManager.enactBolus(units: bolus.value, automatic: false) { (error) in
                 if error == nil {
                     self.deviceManager.analyticsServicesManager.didSetBolusFromWatch(bolus.value)
                 }