Skip to content

Auto-restart Live Activity when iOS sends .ended #659

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bjorkert wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Auto-restart Live Activity when iOS sends .ended #659

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion LoopFollow/LiveActivity/LiveActivityManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1318,7 +1318,8 @@ final class LiveActivityManager {
for await state in activity.activityStateUpdates {
LogManager.shared.log(category: .general, message: "Live Activity state id=\(activity.id) -> \(state)", isDebug: true)
if state == .ended || state == .dismissed {
if current?.id == activity.id {
let wasCurrentActivity = current?.id == activity.id
if wasCurrentActivity {
current = nil
// Do NOT clear laRenewBy here. Preserving it means handleForeground()
// can detect the renewal window on the next foreground event and restart
Expand All @@ -1330,6 +1331,20 @@ final class LiveActivityManager {
// • the user disables LA or calls forceRestart
LogManager.shared.log(category: .general, message: "[LA] activity cleared id=\(activity.id) state=\(state)", isDebug: true)
}
if state == .ended, wasCurrentActivity, !endingForRestart {
// iOS terminated the activity itself — typically the ~8h lifetime
// cap reached before renewal fired. The .dismissed path below
// already handles iOS-initiated dismissals via renewalFailed /
// pastDeadline, but .ended bypasses that branch entirely. Without
// a signal here, handleForeground() sees `renewalFailed=false` and
// `renewBy` still in the future, returns "no action needed", and
// startIfNeeded keeps re-binding the corpse — the LA stays dark
// until the user manually force-restarts. Mark renewalFailed so
// the next foreground entry runs performForegroundRestart, which
// sweeps any leftover ended activity and pushes a fresh one.
Storage.shared.laRenewalFailed.value = true
LogManager.shared.log(category: .general, message: "[LA] ended by iOS (not our restart) — marked renewalFailed=true, auto-restart on next foreground")
}
if state == .dismissed {
// Three possible sources of .dismissed — only the third blocks restart:
//
Expand Down
Loading