Red loop retry should refresh device data (#1381)

Author: ps2

Loop/Managers/DeviceDataManager.swift

@@ -419,16 +419,31 @@ extension DeviceDataManager: PumpManagerDelegate {
         }
         lastBLEDrivenUpdate = Date()
 
-        cgmManager?.fetchNewDataIfNeeded { (result) in
-            if case .newData = result {
-                AnalyticsManager.shared.didFetchNewCGMData()
-            }
+        refreshCGM()
+    }
+    
+    private func refreshCGM(_ completion: (() -> Void)? = nil) {
+        if let cgmManager = cgmManager {
+            cgmManager.fetchNewDataIfNeeded { (result) in
+                if case .newData = result {
+                    AnalyticsManager.shared.didFetchNewCGMData()
+                }
 
-            if let manager = self.cgmManager {
                 self.queue.async {
-                    self.processCGMResult(manager, result: result)
+                    self.processCGMResult(cgmManager, result: result)
+                    completion?()
                 }
             }
+        } else {
+            completion?()
+        }
+    }
+    
+    func refreshDeviceData() {
+        refreshCGM() {
+            self.queue.async {
+                self.pumpManager?.assertCurrentPumpData()
+            }
         }
     }
 

Loop/View Controllers/StatusTableViewController.swift

@@ -1282,7 +1282,7 @@ final class StatusTableViewController: ChartsTableViewController {
         if error != nil {
             let alertController = UIAlertController(with: error!)
             let manualLoopAction = UIAlertAction(title: NSLocalizedString("Retry", comment: "The button text for attempting a manual loop"), style: .default, handler: { _ in
-                self.deviceManager.loopManager.loop()
+                self.deviceManager.refreshDeviceData()
             })
             alertController.addAction(manualLoopAction)
             present(alertController, animated: true)