From 923d24282e40da3af48a0547edea27139da910b2 Mon Sep 17 00:00:00 2001
From: MtlPhil <76601115+MtlPhil@users.noreply.github.com>
Date: Thu, 26 Mar 2026 05:57:29 -0400
Subject: [PATCH] Fix LA not refreshing on foreground after stale overlay
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

startIfNeeded() unconditionally reused any existing activity, which
meant that on cold start (app killed while stale overlay was showing)
willEnterForeground is never sent, handleForeground never runs, and
viewDidAppear → startFromCurrentState → startIfNeeded just rebinds to
the stale activity — leaving the overlay visible.

Fix: before reusing an existing activity in startIfNeeded(), check
whether its staleDate has passed or the renewal window is open. If so,
end it (awaited) and call startIfNeeded() again so a fresh activity
with a new 7.5h deadline is started.

Also add cancelRenewalFailedNotification() to handleForeground() so
the "Live Activity Expiring" system notification is dismissed whenever
the foreground restart path fires, not only via forceRestart().

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../LiveActivity/LiveActivityManager.swift    | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/LoopFollow/LiveActivity/LiveActivityManager.swift b/LoopFollow/LiveActivity/LiveActivityManager.swift
index 5b8f13bbf..9d62140fd 100644
--- a/LoopFollow/LiveActivity/LiveActivityManager.swift
+++ b/LoopFollow/LiveActivity/LiveActivityManager.swift
@@ -120,6 +120,7 @@ final class LiveActivityManager {
         // new LA is started computes showRenewalOverlay = false.
         Storage.shared.laRenewBy.value = 0
         Storage.shared.laRenewalFailed.value = false
+        cancelRenewalFailedNotification()
 
         guard let activity = current else {
             startFromCurrentState()
@@ -189,6 +190,28 @@ final class LiveActivityManager {
         }
 
         if let existing = Activity<GlucoseLiveActivityAttributes>.activities.first {
+            // Before reusing, check whether this activity needs a restart. This covers cold
+            // starts (app was killed while the overlay was showing — willEnterForeground is
+            // never sent, so handleForeground never runs) and any other path that lands here
+            // without first going through handleForeground.
+            let renewBy = Storage.shared.laRenewBy.value
+            let now = Date().timeIntervalSince1970
+            let staleDatePassed = existing.content.staleDate.map { $0 <= Date() } ?? false
+            let inRenewalWindow = renewBy > 0 && now >= renewBy - LiveActivityManager.renewalWarning
+            let needsRestart = Storage.shared.laRenewalFailed.value || inRenewalWindow || staleDatePassed
+
+            if needsRestart {
+                LogManager.shared.log(category: .general, message: "[LA] existing activity is stale on startIfNeeded — ending and restarting (staleDatePassed=\(staleDatePassed), inRenewalWindow=\(inRenewalWindow))")
+                Storage.shared.laRenewBy.value = 0
+                Storage.shared.laRenewalFailed.value = false
+                cancelRenewalFailedNotification()
+                Task {
+                    await existing.end(nil, dismissalPolicy: .immediate)
+                    await MainActor.run { self.startIfNeeded() }
+                }
+                return
+            }
+
             bind(to: existing, logReason: "reuse")
             Storage.shared.laRenewalFailed.value = false
             return