Skip to content

Live activity#537

Draft
bjorkert wants to merge 9 commits intodevfrom
live-activity
Draft

Live activity#537
bjorkert wants to merge 9 commits intodevfrom
live-activity

Conversation

@bjorkert
Copy link
Contributor

This PR replaces #534

Work in progress.

MtlPhil and others added 6 commits March 7, 2026 17:05
…f-push)

Implements a lock screen and Dynamic Island Live Activity for LoopFollow displaying real-time glucose data updated via APNs self-push.

## What's included

- Lock screen card: glucose + trend arrow, delta, IOB, COB, projected, last update time, threshold-driven background color (green/orange/red)
- Dynamic Island: compact, expanded, and minimal presentations
- Not Looping overlay: red banner when Loop hasn't reported in 15+ min
- APNs self-push: app sends push to itself for reliable background updates without interference from background audio session
- Single source of truth: all data flows from Storage/Observable
- Source-agnostic: IOB/COB/projected are optional, safe for Dexcom-only users
- Dynamic App Group ID: derived from bundle identifier, no hardcoded team IDs
- APNs key injected via xcconfig/Info.plist — never bundled, never committed

## Files added
- LoopFollow/LiveActivity/: APNSClient, APNSJWTGenerator, AppGroupID, GlucoseLiveActivityAttributes, GlucoseSnapshot, GlucoseSnapshotBuilder, GlucoseSnapshotStore, GlucoseUnitConversion, LAAppGroupSettings, LAThresholdSync, LiveActivityManager, PreferredGlucoseUnit, StorageCurrentGlucoseStateProvider
- LoopFollowLAExtension/: LoopFollowLiveActivity, LoopFollowLABundle
- docs/LiveActivity.md (architecture + APNs setup guide)

## Files modified
- Storage: added lastBgReadingTimeSeconds, lastDeltaMgdl, lastTrendCode, lastIOB, lastCOB, projectedBgMgdl
- Observable: added isNotLooping
- BGData, DeviceStatusLoop, DeviceStatusOpenAPS: write canonical values to Storage
- DeviceStatus: write isNotLooping to Observable
- BackgroundTaskAudio: cleanup
- MainViewController: wired LiveActivityManager.refreshFromCurrentState()
- Info.plist: added APNSKeyID, APNSTeamID, APNSKeyContent build settings
- fastlane/Fastfile: added extension App ID and provisioning profile
- build_LoopFollow.yml: inject APNs key from GitHub secret
- Consolidate JWT generation into JWTManager using CryptoKit with
  multi-slot in-memory cache, removing SwiftJWT and swift-crypto SPM
  dependencies
- Separate APNs keys for LoopFollow (lf) vs remote commands, with
  automatic team-ID routing and a migration step for legacy keys
- Add dedicated APN settings page for LoopFollow's own APNs keys
- Remove hardcoded APNs credentials from CI workflow and Info.plist
  in favor of user-configured keys
- Apply swiftformat to Live Activity files
@bjorkert
Copy link
Contributor Author

Summary of changes in 524b3bb — Replace SwiftJWT with CryptoKit and separate APNs credentials

Dependency removal:

  • Removes the SwiftJWT and swift-crypto SPM packages entirely. JWT signing now uses Apple's built-in CryptoKit (P256/ES256), eliminating two third-party dependencies.

JWT consolidation:

  • Deletes APNSJWTGenerator.swift. All JWT generation logic is now in JWTManager.swift, which uses an in-memory cache (keyed by keyId:teamId, 55-min TTL) instead of persisting JWT tokens to UserDefaults.

APNs credential separation:

  • Previously there was one set of APNs credentials (apnsKey/keyId) shared between remote commands and Live Activity. Now there are two distinct sets:
    • lfApnsKey/lfKeyId — for LoopFollow's own Live Activity pushes
    • remoteApnsKey/remoteKeyId — for remote commands to Loop/Trio
  • Removes the old "Return Notification Settings" section (which appeared when team IDs differed). Instead, the remote credential fields only show when team IDs differ, and LoopFollow credentials are always entered in the new APNSettingsView.

New APNSettingsView:

  • Adds a dedicated settings screen under the Settings menu for entering LoopFollow's own APNs Key ID and Key.

Migration (migrateStep5):

  • Migrates old credential storage keys (apnsKey, keyId, returnApnsKey, returnKeyId) to the new separated keys, handling same-team vs different-team scenarios. Cleans up the legacy keys afterward.

Build/CI updates:

  • Removes the Inject APNs Key Content CI step — credentials are no longer baked into the build via xcconfig/Info.plist. They're entered by the user at runtime.
  • Removes APNSKeyContent, APNSKeyID, APNSTeamID from Info.plist.
  • Updates CI to macos-26 / Xcode_26.2.

APNSClient refactored:

  • Uses JWTManager.shared instead of APNSJWTGenerator. Reads credentials from Storage.shared. Selects sandbox vs production APNs host based on BuildDetails.isTestFlightBuild().

Code style:

  • Standardized file headers, alphabetized imports, added trailing commas, cleaned up whitespace throughout the LiveActivity and Remote modules.

@bjorkert
Copy link
Contributor Author

Consolidated duplicated code in the Live Activity branch:

  • All glucose values now stored in mg/dL — removed the round-trip conversion (mg/dL → mmol/L at snapshot creation, then mmol/L → mg/dL for threshold comparison). Conversion to mmol/L now happens only at display time in LAFormat.
  • Single conversion constant — deleted GlucoseUnitConversion.swift (used 18.0182) and unified on GlucoseConversion.swift (18.01559), with mgDlToMmolL as a computed reciprocal.
  • Deduplicated unit detectionPreferredGlucoseUnit.hkUnit() now delegates to Localizer.getPreferredUnit() instead of duplicating it.
  • Added FortyFiveUp/FortyFiveDown trends — new upSlight/downSlight cases rendering as ↗/↘︎ instead of collapsing to ↑/↓.
  • Fixed locale bugLAFormat now uses NumberFormatter with Locale.current so decimal separators match the main app (e.g. "5,6" for Swedish locale).
  • Deleted dead code — removed LAThresholdSync.swift (never called).
  • Fixed APNs payload — added missing isNotLooping field so push-based updates correctly show the "Not Looping" overlay.

…ension

- Wrap ActivityKit-dependent files (GlucoseLiveActivityAttributes,
  LiveActivityManager, APNSClient) in #if !targetEnvironment(macCatalyst)
- Guard LiveActivityManager call sites in MainViewController, BGData,
  and DeviceStatus with the same compile-time check
- Remove unnecessary @available(iOS 16.1, *) checks (deployment target
  is already 16.6)
- Add platformFilter = ios to the widget extension embed phase and
  target dependency so it is excluded from Mac Catalyst builds
@bjorkert
Copy link
Contributor Author

Mac Catalyst build fix

Problem

ActivityKit is iOS-only — its module exists in the Mac Catalyst SDK but every API is marked @available(macCatalyst, unavailable). #if canImport(ActivityKit) evaluates to true on Mac Catalyst and if #available(iOS 16.1, *) runtime checks also pass, so neither helps. Additionally, the widget extension (LoopFollowLAExtensionExtension.appex) was being embedded unconditionally, causing an "embedded content built for the iOS platform" error.

Changes

Compile-time guards (#if !targetEnvironment(macCatalyst)):

  • Wrapped entire file contents of GlucoseLiveActivityAttributes.swift, LiveActivityManager.swift, and APNSClient.swift
  • Wrapped call sites in MainViewController.swift, BGData.swift, and DeviceStatus.swift

Removed unnecessary @available(iOS 16.1, *) checks — deployment target is already 16.6, so these were dead code.

Excluded widget extension from Mac Catalyst builds — added platformFilter = ios to both the embed build phase and target dependency for LoopFollowLAExtensionExtension in the Xcode project.

No logic changes — only build configuration and compile-time guards.

@MtlPhil
Copy link

MtlPhil commented Mar 13, 2026

Live Activity auto-renewal (8-hour limit workaround)

PR Link

Apple enforces an 8-hour maximum lifetime on Live Activities in the Dynamic Island.

Approach

On every glucose refresh (~5 min), LiveActivityManager checks whether the current LA has passed its renewal deadline. If so, it:

  1. Requests a new LA first (so the user keeps live data if the request fails)
  2. Ends the old LA with .immediate dismissal (removes the lock screen card instantly)
  3. Records a new 7.5-hour deadline in Storage.shared.laRenewBy

If the request fails, laRenewalFailed is set and the existing LA is kept. On next foreground entry, the stale LA is ended and a fresh one is started.

Renewal warning overlay

Starting 20 minutes before the renewal deadline, a gray "Tap to update" overlay is rendered over the lock screen view and all expanded Dynamic Island regions. This prompts the user to bring the app to the foreground, where the LA can be renewed.

The overlay flag (showRenewalOverlay) is computed in GlucoseSnapshotBuilder and included in every APNs push payload so it is delivered reliably in the background.

Robustness

  • New-first renewal order. The new LA is requested before the old one is ended. If Activity.request() throws, the old LA remains intact and laRenewalFailed is set.
  • staleDate tied to renewal deadline. ActivityContent.staleDate is set to laRenewBy so ActivityKit marks the content stale at exactly the renewal moment.
  • Foreground retry awaits end. On foreground retry after a failed renewal, laRenewBy and laRenewalFailed are cleared synchronously, then activity.end() is awaited before startFromCurrentState() is called. This ensures Activity.activities is empty when startIfNeeded() runs, forcing a fresh-request path that writes a new deadline, preventing a stale overlay from appearing on the restarted LA.
  • showRenewalOverlay in APNs payload. The field is included in every push so background deliveries correctly activate and clear the overlay.
  • Orphaned activity cleanup. On app launch, endOrphanedActivities() ends any untracked Live Activities left behind by a previous crash.

Files changed

File: Storage/Storage.swift
Change: Added laRenewBy: TimeInterval and laRenewalFailed: Bool
────────────────────────────────────────
File: LiveActivity/GlucoseSnapshot.swift
Change: Added showRenewalOverlay: Bool field
────────────────────────────────────────
File: LiveActivity/GlucoseSnapshotBuilder.swift
Change: Computes showRenewalOverlay from laRenewBy
────────────────────────────────────────
File: LiveActivity/APNSClient.swift
Change: Includes showRenewalOverlay in APNs push payload
────────────────────────────────────────
File: LiveActivity/LiveActivityManager.swift
Change: Renewal logic: renewIfNeeded(), endOrphanedActivities(), foreground retry, renewalThreshold/renewalWarning constants
────────────────────────────────────────
File: LoopFollowLAExtension/LoopFollowLiveActivity.swift
Change: "Tap to update" overlay on lock screen and Dynamic Island expanded regions

Testing checklist

  • "Tap to update" overlay appears 20 minutes before the renewal deadline
  • LA is replaced cleanly at the renewal deadline (no duplicate cards, no stale overlay on new LA)
  • Foreground retry after a failed renewal starts a fresh LA with showRenewalOverlay = false
  • Orphaned activities from a previous crash are cleaned up on launch

* feat: Live Activity auto-renewal to work around 8-hour system limit

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* test: reduce LA renewal threshold to 20 min for testing

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* feat: improve LA renewal robustness and stale indicator

- staleDate on every ActivityContent now tracks the renewal deadline,
  so the system shows Apple's built-in stale indicator if renewal fails
- Add laRenewalFailed StorageValue; set on Activity.request() failure,
  cleared on any successful LA start
- Observe willEnterForegroundNotification: retry startIfNeeded() if a
  previous renewal attempt failed
- New-first renewal order: request the replacement LA before ending the
  old one — if the request throws the existing LA stays alive so the
  user keeps live data until the system kills it at the 8-hour mark

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* feat: renewal warning overlay + restore 7.5h threshold

- Restore renewalThreshold to 7.5 * 3600 (testing complete)
- Add showRenewalOverlay: Bool to GlucoseSnapshot (Codable, default false)
- GlucoseSnapshotBuilder sets it true when now >= laRenewBy - 1800
  (30 minutes before the renewal deadline)
- Lock screen: 60% gray overlay with "Tap to update" centered in white,
  layered above the existing isNotLooping overlay
- DI expanded: RenewalOverlayView applied to leading/trailing/bottom
  regions; "Tap to update" text shown on the bottom region only
- showRenewalOverlay resets to false automatically on renewal since
  laRenewBy is updated and the next snapshot rebuild clears the flag

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* fix: overlay not appearing + foreground restart not working

Overlay rendering:
- Replace Group{if condition{ZStack{RoundedRectangle...}}} with a
  permanently-present ZStack toggled via .opacity(). The Group/if
  pattern causes SwiftUI sizing ambiguity when the condition transitions
  from false→true inside an .overlay(), producing a zero-size result.
  The .opacity() approach keeps a stable view hierarchy.
- Same fix applied to RenewalOverlayView used on DI expanded regions.

Foreground restart:
- handleForeground() was calling startIfNeeded(), which finds the
  still-alive (failed-to-renew) LA in Activity.activities and reuses
  it, doing nothing useful. Fixed to manually nil out current, cancel
  all tasks, await activity.end(.immediate), then startFromCurrentState().

Overlay timing:
- Changed warning window from 30 min (1800s) to 20 min (1200s) before
  the renewal deadline, matching the intended test cadence.

Logging:
- handleForeground: log on every foreground event with laRenewalFailed value
- renewIfNeeded: log how many seconds past the deadline when firing
- GlucoseSnapshotBuilder: log when overlay activates with seconds to deadline
- performRefresh: log when sending an update with the overlay visible

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* test: set renewalThreshold to 20 min for testing

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* fix: renewal overlay not clearing after LA is refreshed

Normal renewal path (renewIfNeeded success):
- Build a fresh snapshot with showRenewalOverlay: false for the new
  LA's initial content — it has a new deadline so the overlay should
  never be visible from the first frame.
- Save that fresh snapshot to GlucoseSnapshotStore so the next
  duplicate check has the correct baseline and doesn't suppress the
  first real BG update.

Foreground restart path (handleForeground):
- Zero laRenewBy before calling startFromCurrentState() so
  GlucoseSnapshotBuilder computes showRenewalOverlay = false for the
  seed snapshot. startIfNeeded() then sets the new deadline after the
  request succeeds.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* fix: overlay permanently active when warning window equals threshold

With renewalThreshold=20min and the hardcoded 1200s warning window,
renewBy-1200 = start, so showRenewalOverlay is always true from the
moment the LA begins.

Extract a named renewalWarning constant (5 min for testing) so the
warning window is always less than the threshold. The builder now reads
LiveActivityManager.renewalWarning instead of a hardcoded literal.

Production values to restore before merging:
  renewalThreshold = 7.5 * 3600
  renewalWarning   = 20 * 60

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* fix: include showRenewalOverlay in APNs payload and clear laRenewBy synchronously

APNSClient was missing showRenewalOverlay from the push payload, so background
APNs updates never delivered the overlay flag to the extension — only foreground
direct ActivityKit updates did.

In handleForeground, laRenewBy is now zeroed synchronously before spawning the
async end/restart Task. This means any snapshot built between the foreground
notification and the new LA start (e.g. from viewDidAppear's startFromCurrentState)
computes showRenewalOverlay = false rather than reading the stale expired deadline.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* fix: await LA end before restarting on foreground retry to avoid reuse path

Reset laRenewBy and laRenewalFailed synchronously before tearing down the
failed LA, then await activity.end() before calling startFromCurrentState().

This guarantees Activity.activities is clear when startIfNeeded() runs, so
it takes the fresh-request path and writes a new laRenewBy. startFromCurrentState
rebuilds the snapshot with showRenewalOverlay=false (laRenewBy=0), saves it
to the store, then startIfNeeded uses that clean snapshot as the seed.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* chore: restore production renewal timing (7.5h threshold, 20min warning)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

---------

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants