Remove remote command polling (moved to separate PR #566)

bjorkert · bjorkert · commit 49f680ab9ac2 · 2026-03-21T19:55:01.000+01:00
diff --git a/LoopFollow/Controllers/Nightscout/DeviceStatus.swift b/LoopFollow/Controllers/Nightscout/DeviceStatus.swift
@@ -220,7 +220,6 @@ extension MainViewController {
                 )
 
             } else if secondsAgo >= (5 * 60) {
-                self.evaluateRemoteCommandPollingCompletion()
                 TaskScheduler.shared.rescheduleTask(
                     id: .deviceStatus,
                     to: Date().addingTimeInterval(10)
diff --git a/LoopFollow/Controllers/Nightscout/Treatments.swift b/LoopFollow/Controllers/Nightscout/Treatments.swift
@@ -184,6 +184,5 @@ extension MainViewController {
             }
         }
         processCage(entries: pumpSiteChange)
-        evaluateRemoteCommandPollingCompletion()
     }
 }
diff --git a/LoopFollow/Remote/LoopAPNS/LoopAPNSBolusView.swift b/LoopFollow/Remote/LoopAPNS/LoopAPNSBolusView.swift
@@ -373,7 +373,6 @@ struct LoopAPNSBolusView: View {
                     TOTPService.shared.markTOTPAsUsed(qrCodeURL: Storage.shared.loopAPNSQrCodeURL.value)
                     self.alertMessage = "Insulin sent successfully!"
                     self.alertType = .success
-                    NotificationCenter.default.post(name: .remoteCommandSucceeded, object: nil)
                     LogManager.shared.log(
                         category: .apns,
                         message: "Insulin sent - Amount: \(insulinAmount.doubleValue(for: .internationalUnit()))U"
diff --git a/LoopFollow/Remote/LoopAPNS/LoopAPNSCarbsView.swift b/LoopFollow/Remote/LoopAPNS/LoopAPNSCarbsView.swift
@@ -505,7 +505,6 @@ struct LoopAPNSCarbsView: View {
                     timeFormatter.timeStyle = .short
                     self.alertMessage = "Carbs sent successfully for \(timeFormatter.string(from: adjustedConsumedDate))!"
                     self.alertType = .success
-                    NotificationCenter.default.post(name: .remoteCommandSucceeded, object: nil)
                     LogManager.shared.log(
                         category: .apns,
                         message: "Carbs sent - Amount: \(carbsAmount.doubleValue(for: .gram()))g, Absorption: \(absorptionConfirmationText)h, Time: \(adjustedConsumedDate)"
diff --git a/LoopFollow/Remote/LoopAPNS/OverridePresetsView.swift b/LoopFollow/Remote/LoopAPNS/OverridePresetsView.swift
@@ -407,7 +407,6 @@ class OverridePresetsViewModel: ObservableObject {
                 self.isActivating = false
                 self.statusMessage = "\(preset.name) override activated successfully."
                 self.alertType = .statusSuccess
-                NotificationCenter.default.post(name: .remoteCommandSucceeded, object: nil)
                 self.showAlert = true
             }
         } catch {
@@ -431,7 +430,6 @@ class OverridePresetsViewModel: ObservableObject {
                 self.isActivating = false
                 self.statusMessage = "Active override cancelled successfully."
                 self.alertType = .statusSuccess
-                NotificationCenter.default.post(name: .remoteCommandSucceeded, object: nil)
                 self.showAlert = true
             }
         } catch {
diff --git a/LoopFollow/Remote/RemoteType.swift b/LoopFollow/Remote/RemoteType.swift
@@ -9,7 +9,3 @@ enum RemoteType: String, Codable {
     case trc = "Trio Remote Control"
     case loopAPNS = "Loop APNS"
 }
-
-extension Notification.Name {
-    static let remoteCommandSucceeded = Notification.Name("remoteCommandSucceeded")
-}
diff --git a/LoopFollow/Remote/TRC/BolusView.swift b/LoopFollow/Remote/TRC/BolusView.swift
@@ -272,7 +272,6 @@ struct BolusView: View {
                         category: .apns,
                         message: "sendBolusPushNotification succeeded - Bolus: \(InsulinFormatter.shared.string(bolusAmount)) U"
                     )
-                    NotificationCenter.default.post(name: .remoteCommandSucceeded, object: nil)
                     bolusAmount = HKQuantity(unit: .internationalUnit(), doubleValue: 0.0)
                     alertType = .statusSuccess
                 } else {
diff --git a/LoopFollow/Remote/TRC/MealView.swift b/LoopFollow/Remote/TRC/MealView.swift
@@ -305,7 +305,6 @@ struct MealView: View {
                         category: .apns,
                         message: "sendMealPushNotification succeeded - Carbs: \(carbs.doubleValue(for: .gram())) g, Protein: \(protein.doubleValue(for: .gram())) g, Fat: \(fat.doubleValue(for: .gram())) g, Bolus: \(bolusAmount.doubleValue(for: .internationalUnit())) U, Scheduled: \(scheduledDate != nil ? formatDate(scheduledDate!) : "now")"
                     )
-                    NotificationCenter.default.post(name: .remoteCommandSucceeded, object: nil)
 
                     // Reset meal values and scheduled data after success
                     carbs = HKQuantity(unit: .gram(), doubleValue: 0.0)
diff --git a/LoopFollow/Remote/TRC/OverrideView.swift b/LoopFollow/Remote/TRC/OverrideView.swift
@@ -175,7 +175,6 @@ struct OverrideView: View {
                     self.statusMessage = "Override command sent successfully."
                     self.alertType = .statusSuccess
                     LogManager.shared.log(category: .apns, message: "sendOverridePushNotification succeeded for override: \(override.name)")
-                    NotificationCenter.default.post(name: .remoteCommandSucceeded, object: nil)
                 } else {
                     self.statusMessage = errorMessage ?? "Failed to send override command."
                     self.alertType = .statusFailure
@@ -196,7 +195,6 @@ struct OverrideView: View {
                     self.statusMessage = "Cancel override command sent successfully."
                     self.alertType = .statusSuccess
                     LogManager.shared.log(category: .apns, message: "sendCancelOverridePushNotification succeeded")
-                    NotificationCenter.default.post(name: .remoteCommandSucceeded, object: nil)
                 } else {
                     self.statusMessage = errorMessage ?? "Failed to send cancel override command."
                     self.alertType = .statusFailure
diff --git a/LoopFollow/Remote/TRC/TempTargetView.swift b/LoopFollow/Remote/TRC/TempTargetView.swift
@@ -255,7 +255,6 @@ struct TempTargetView: View {
                     self.statusMessage = "Temp target command successfully sent."
                     self.alertType = .statusSuccess
                     LogManager.shared.log(category: .apns, message: "sendTempTargetPushNotification succeeded with target: \(newHKTarget), duration: \(duration)")
-                    NotificationCenter.default.post(name: .remoteCommandSucceeded, object: nil)
                 } else {
                     self.statusMessage = errorMessage ?? "Failed to send temp target command."
                     self.alertType = .statusFailure
@@ -276,7 +275,6 @@ struct TempTargetView: View {
                     self.statusMessage = "Cancel temp target command successfully sent."
                     self.alertType = .statusSuccess
                     LogManager.shared.log(category: .apns, message: "sendCancelTempTargetPushNotification succeeded")
-                    NotificationCenter.default.post(name: .remoteCommandSucceeded, object: nil)
                 } else {
                     self.statusMessage = errorMessage ?? "Failed to send cancel temp target command."
                     self.alertType = .statusFailure
diff --git a/LoopFollow/Remote/TRC/TrioNightscoutRemoteController.swift b/LoopFollow/Remote/TRC/TrioNightscoutRemoteController.swift
@@ -19,7 +19,6 @@ class TrioNightscoutRemoteController {
                 let response: [TreatmentCancelResponse] = try await NightscoutUtils.executePostRequest(eventType: .treatments, body: tempTargetBody)
                 Observable.shared.tempTarget.value = nil
                 NotificationCenter.default.post(name: NSNotification.Name("refresh"), object: nil)
-                NotificationCenter.default.post(name: .remoteCommandSucceeded, object: nil)
                 completion(true)
             } catch {
                 completion(false)
@@ -43,7 +42,6 @@ class TrioNightscoutRemoteController {
                 let response: [TreatmentResponse] = try await NightscoutUtils.executePostRequest(eventType: .treatments, body: tempTargetBody)
                 Observable.shared.tempTarget.value = newTarget
                 NotificationCenter.default.post(name: NSNotification.Name("refresh"), object: nil)
-                NotificationCenter.default.post(name: .remoteCommandSucceeded, object: nil)
                 completion(true)
             } catch {
                 completion(false)
diff --git a/LoopFollow/ViewControllers/MainViewController.swift b/LoopFollow/ViewControllers/MainViewController.swift
@@ -16,29 +16,6 @@ func IsNightscoutEnabled() -> Bool {
 }
 
 class MainViewController: UIViewController, UITableViewDataSource, ChartViewDelegate, UNUserNotificationCenterDelegate, UIScrollViewDelegate {
-    private struct RemoteCommandDataSignature {
-        let carbTimestamp: TimeInterval?
-        let bolusTimestamp: TimeInterval?
-        let overrideTimestamp: TimeInterval?
-        let overrideStateKey: String
-
-        func detectsFreshData(comparedTo baseline: RemoteCommandDataSignature) -> Bool {
-            if let carbTimestamp, carbTimestamp > (baseline.carbTimestamp ?? 0) {
-                return true
-            }
-
-            if let bolusTimestamp, bolusTimestamp > (baseline.bolusTimestamp ?? 0) {
-                return true
-            }
-
-            if let overrideTimestamp, overrideTimestamp > (baseline.overrideTimestamp ?? 0) {
-                return true
-            }
-
-            return overrideStateKey != baseline.overrideStateKey
-        }
-    }
-
     var isPresentedAsModal: Bool = false
 
     @IBOutlet var BGText: UILabel!
@@ -161,11 +138,6 @@ class MainViewController: UIViewController, UITableViewDataSource, ChartViewDele
         "deviceStatus": false,
     ]
     private var loadingTimeoutTimer: Timer?
-    private var remoteCommandPollingTimer: Timer?
-    private var remoteCommandPollingStartedAt: Date?
-    private var remoteCommandPollingBaseline: RemoteCommandDataSignature?
-    private let remoteCommandPollingInterval: TimeInterval = 3
-    private let remoteCommandPollingDuration: TimeInterval = 30
 
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -269,13 +241,6 @@ class MainViewController: UIViewController, UITableViewDataSource, ChartViewDele
         refreshScrollView.delegate = self
         NotificationCenter.default.addObserver(self, selector: #selector(refresh), name: NSNotification.Name("refresh"), object: nil)
 
-        NotificationCenter.default.publisher(for: .remoteCommandSucceeded)
-            .receive(on: DispatchQueue.main)
-            .sink { [weak self] _ in
-                self?.startRemoteCommandPolling()
-            }
-            .store(in: &cancellables)
-
         Observable.shared.bgText.$value
             .receive(on: DispatchQueue.main)
             .sink { [weak self] newValue in
@@ -874,7 +839,6 @@ class MainViewController: UIViewController, UITableViewDataSource, ChartViewDele
     }
 
     deinit {
-        remoteCommandPollingTimer?.invalidate()
         NotificationCenter.default.removeObserver(self, name: NSNotification.Name("refresh"), object: nil)
     }
 
@@ -915,75 +879,6 @@ class MainViewController: UIViewController, UITableViewDataSource, ChartViewDele
         refreshControl.endRefreshing()
     }
 
-    private func startRemoteCommandPolling() {
-        guard IsNightscoutEnabled() else { return }
-
-        remoteCommandPollingBaseline = currentRemoteCommandDataSignature()
-        remoteCommandPollingStartedAt = Date()
-        remoteCommandPollingTimer?.invalidate()
-
-        performRemoteCommandPollingTick()
-
-        let timer = Timer.scheduledTimer(withTimeInterval: remoteCommandPollingInterval, repeats: true) { [weak self] _ in
-            self?.performRemoteCommandPollingTick()
-        }
-        timer.tolerance = 0.5
-        remoteCommandPollingTimer = timer
-
-        LogManager.shared.log(category: .general, message: "Started aggressive polling after remote command success")
-    }
-
-    private func stopRemoteCommandPolling(reason: String) {
-        guard remoteCommandPollingTimer != nil || remoteCommandPollingStartedAt != nil else { return }
-
-        remoteCommandPollingTimer?.invalidate()
-        remoteCommandPollingTimer = nil
-        remoteCommandPollingStartedAt = nil
-        remoteCommandPollingBaseline = nil
-
-        LogManager.shared.log(category: .general, message: "Stopped aggressive polling: \(reason)")
-    }
-
-    private func performRemoteCommandPollingTick() {
-        guard let remoteCommandPollingStartedAt else { return }
-
-        if Date().timeIntervalSince(remoteCommandPollingStartedAt) >= remoteCommandPollingDuration {
-            stopRemoteCommandPolling(reason: "timeout reached")
-            return
-        }
-
-        bgTaskAction()
-        deviceStatusAction()
-        treatmentsTaskAction()
-    }
-
-    private func currentRemoteCommandDataSignature() -> RemoteCommandDataSignature {
-        let latestBolusTimestamp = max(bolusData.last?.date ?? 0, smbData.last?.date ?? 0)
-        let overrideNote = Observable.shared.override.value ?? ""
-        let overrideStateKey: String
-
-        if currentOverride != 1.0 || !overrideNote.isEmpty {
-            overrideStateKey = "\(currentOverride)|\(overrideNote)"
-        } else {
-            overrideStateKey = ""
-        }
-
-        return RemoteCommandDataSignature(
-            carbTimestamp: carbData.last?.date,
-            bolusTimestamp: latestBolusTimestamp > 0 ? latestBolusTimestamp : nil,
-            overrideTimestamp: overrideGraphData.last?.date,
-            overrideStateKey: overrideStateKey
-        )
-    }
-
-    func evaluateRemoteCommandPollingCompletion() {
-        guard let remoteCommandPollingBaseline else { return }
-
-        if currentRemoteCommandDataSignature().detectsFreshData(comparedTo: remoteCommandPollingBaseline) {
-            stopRemoteCommandPolling(reason: "fresh remote data received")
-        }
-    }
-
     // Scroll down BGText when refreshing
     func scrollViewDidScroll(_ scrollView: UIScrollView) {
         if scrollView == refreshScrollView {

Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,6 @@ extension MainViewController {`
`220`	`220`	`)`
`221`	`221`
`222`	`222`	`} else if secondsAgo >= (5 * 60) {`
`223`		`- self.evaluateRemoteCommandPollingCompletion()`
`224`	`223`	`TaskScheduler.shared.rescheduleTask(`
`225`	`224`	`id: .deviceStatus,`
`226`	`225`	`to: Date().addingTimeInterval(10)`
Original file line number	Diff line number	Diff line change
`@@ -184,6 +184,5 @@ extension MainViewController {`
`184`	`184`	`}`
`185`	`185`	`}`
`186`	`186`	`processCage(entries: pumpSiteChange)`
`187`		`- evaluateRemoteCommandPollingCompletion()`
`188`	`187`	`}`
`189`	`188`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,3 @@ enum RemoteType: String, Codable {`
`9`	`9`	`case trc = "Trio Remote Control"`
`10`	`10`	`case loopAPNS = "Loop APNS"`
`11`	`11`	`}`
`12`		`-`
`13`		`-extension Notification.Name {`
`14`		`- static let remoteCommandSucceeded = Notification.Name("remoteCommandSucceeded")`
`15`		`-}`
Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,6 @@ struct BolusView: View {`
`272`	`272`	`category: .apns,`
`273`	`273`	`message: "sendBolusPushNotification succeeded - Bolus: \(InsulinFormatter.shared.string(bolusAmount)) U"`
`274`	`274`	`)`
`275`		`- NotificationCenter.default.post(name: .remoteCommandSucceeded, object: nil)`
`276`	`275`	`bolusAmount = HKQuantity(unit: .internationalUnit(), doubleValue: 0.0)`
`277`	`276`	`alertType = .statusSuccess`
`278`	`277`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -305,7 +305,6 @@ struct MealView: View {`
`305`	`305`	`category: .apns,`
`306`	`306`	`message: "sendMealPushNotification succeeded - Carbs: \(carbs.doubleValue(for: .gram())) g, Protein: \(protein.doubleValue(for: .gram())) g, Fat: \(fat.doubleValue(for: .gram())) g, Bolus: \(bolusAmount.doubleValue(for: .internationalUnit())) U, Scheduled: \(scheduledDate != nil ? formatDate(scheduledDate!) : "now")"`
`307`	`307`	`)`
`308`		`- NotificationCenter.default.post(name: .remoteCommandSucceeded, object: nil)`
`309`	`308`
`310`	`309`	`// Reset meal values and scheduled data after success`
`311`	`310`	`carbs = HKQuantity(unit: .gram(), doubleValue: 0.0)`