You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
Android: close screens left open when the app is reopened from the launcher - #686
On Android, closing the app (swiping it from recents) and opening it again from the launcher lands back on whatever screen was on top, e.g. inside Settings. The cause is deliberate plumbing: MainActivity attaches to the engine EdgeApplication caches and never destroys (shouldDestroyEngineWithHost() = false), so background Bluetooth keeps running. The Activity goes, the Dart side and its Navigator stay, and the next Activity attaches to the same stack.
On iOS the process ends, so a relaunch starts fresh on the saved tab with nothing pushed on top. This makes Android do the same.
Scope note: the issue asks to always open on Home. Reopening on the last tab is intentional on both platforms (restoredShellTab() / Prefs.shellTabV2, "so an upgrade lands where the user was"), so this PR keeps it and only closes the screens pushed above the tab. If you'd rather always land on Today, that's a one-line follow-up in _ShellState.
What changes
MainActivity.onCreate: notes whether the cached engine already existed beforeensureEngine. When it did, there is no savedInstanceState, and the intent is the launcher's (ACTION_MAIN + CATEGORY_LAUNCHER), it invokes relaunched on a new openstrap/activity channel.
Not on a system restore (savedInstanceState != null): Android recreated the Activity and the user expects the screen back.
Not for notification taps (SELECT_NOTIFICATION, flutter_local_notifications 18.0.1), home_widget taps (HOME_WIDGET_LAUNCH_ACTION), or our own StrapWidgets tap (no action): those keep routing as before.
Rotation / dark mode never reach onCreate (configChanges in the manifest).
lib/platform/activity_relaunch.dart (new): handles relaunched by popUntil(isFirst) on the root navigator. stop() only clears its own owner's handler, so a replaced owner's dispose (which runs after its successor's initState) can't silence the successor.
lib/app.dart (_ShellState): listens in initState, stops in dispose. The tab is untouched. A running workout stays reachable through the existing _LiveSessionBar above every tab.
Tests
New test/activity_relaunch_test.dart (4 widget tests, driven through the real method channel): relaunched closes every pushed screen back to the tab; any other method does nothing; a disposed owner is a no-op; a replaced owner's stop doesn't remove its successor's handler.
flutter analyze: no issues.
flutter test --concurrency=1: 7047 passed, 28 skipped, 1 failed. The failure is health_workout_export_delete_gate_test, which fails on any macOS host on current main and is fixed by Pin the Health Connect delete-gate test to Health Connect (fails on macOS) #685 (it pins that test to Health Connect). Two files (synthetic_oura_day_test, whoop_fallback_night_banked_test) reported "did not complete" in that run while other tests were running on the same machine; re-run on their own, all 10 of their tests pass.
Verified on an Android emulator (API 37, arm64, debug build; no band paired, onboarding skipped). The Activity was ended with am stack remove <task>, which destroys it while the process (and the cached engine) stays alive, the same state as swiping the app away while the foreground service keeps the process. The PID was checked before and after each step.
Settings open, rotate to landscape and back, toggle dark mode
unchanged
unchanged (no reset)
Settings open, task removed, relaunched with act=SELECT_NOTIFICATION (the action flutter_local_notifications uses; no payload)
—
Settings stays: the reset is not sent for a non-launcher intent
The Kotlin compiles and runs. Not covered: a real notification tap end to end (no band, so the app posted none; the third row exercises the intent gate it depends on), and a physical device.
On Android the Flutter engine outlives the Activity (it is cached and
never destroyed, so background Bluetooth keeps running). Swiping the
app away and opening it again from the launcher attached a new
Activity to the same Navigator, so the app reopened inside whatever
screen was on top, e.g. Settings (OpenStrap#650). On iOS the process ends and a
relaunch starts on the saved tab with nothing above it.
MainActivity now notes whether the engine already existed before
ensureEngine, and when it did, with no savedInstanceState and the
launcher's ACTION_MAIN/CATEGORY_LAUNCHER intent, sends `relaunched` on
a new openstrap/activity channel. The shell handles it by popping to
the first route. The saved tab is kept: restoring it is intentional
(restoredShellTab). System restores, notification taps and widget taps
are untouched; rotation and dark mode never reach onCreate
(configChanges).
Exercise launcher relaunch navigation, non-relaunch calls, missing navigators, and handler ownership replacement through the method channel.
test/activity_relaunch_test.dart L1-107
Tips and commands
Interacting with Sourcery
Trigger a new review: Comment @sourcery-ai review on the pull request.
Continue discussions: Reply directly to Sourcery's review comments.
Generate a GitHub issue from a review comment: Ask Sourcery to create an
issue from a review comment by replying to it. You can also reply to a
review comment with @sourcery-ai issue to create an issue from it.
Generate a pull request title: Write @sourcery-ai anywhere in the pull
request title to generate a title at any time. You can also comment @sourcery-ai title on the pull request to (re-)generate the title at any time.
Generate a pull request summary: Write @sourcery-ai summary anywhere in
the pull request body to generate a PR summary at any time exactly where you
want it. You can also comment @sourcery-ai summary on the pull request to
(re-)generate the summary at any time.
Generate reviewer's guide: Comment @sourcery-ai guide on the pull
request to (re-)generate the reviewer's guide at any time.
Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
pull request to resolve all Sourcery comments. Useful if you've already
addressed all the comments and don't want to see them anymore.
Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
request to dismiss all existing Sourcery reviews. Especially useful if you
want to start fresh with a new review - don't forget to comment @sourcery-ai review to trigger a new review!
Reviewing files that changed from the base of the PR and between 14fca0b and 0934cfd.
Files ignored due to path filters: 1
test/activity_relaunch_test.dart is excluded by !test/**
Files selected for processing: 1
lib/platform/activity_relaunch.dart
No actionable comments were generated in the recent review.
Walkthrough
The app now handles Android activity relaunch method calls by returning the shell navigator to its first route. The shell registers and unregisters the navigator callback with its lifecycle.
ActivityRelaunch handles relaunched calls by popping the current navigator to its first route. It removes the method handler only when the stopping callback matches the registered callback.
Connect the shell navigator lib/app.dart
_ShellState registers a callback that returns its navigator when mounted and unregisters it during disposal.
sequenceDiagram
participant AndroidActivity
participant ActivityRelaunch
participant ShellState
participant NavigatorState
AndroidActivity->>ActivityRelaunch: Send relaunched method call
ActivityRelaunch->>ShellState: Resolve registered navigator callback
ShellState-->>ActivityRelaunch: Return navigator when mounted
ActivityRelaunch->>NavigatorState: Pop routes until first route
Loading
Possibly related issues
OpenStrap/edge#650: The issue reports Android reopening the last visited screen. This change handles relaunches by popping the current navigator to its first route.
Suggested reviewers:abdulsaheel
Merge Risk: Minimal · previous review 14fca
No actionable merge-blocking issue was established. Android device behavior remains unverified.
Pre-merge checks: 4
Check name
Status
Explanation
Description Check
Check skipped - CodeRabbit’s high-level summary is enabled.
Title check
The title clearly describes the main change: closing screens left open when the app is reopened from the launcher.
Linked Issues check
Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check
Check skipped because no linked issues were found for this pull request.
Finishing Touches
Generate unit tests (beta)
Create a new PR
Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.
Reviewing files that changed from the base of the PR and between 69341a6 and 14fca0b.
Files ignored due to path filters: 2
android/app/src/main/kotlin/wtf/openstrap/openstrap_edge/MainActivity.kt is excluded by !android/**
test/activity_relaunch_test.dart is excluded by !test/**
Files selected for processing: 2
lib/app.dart
lib/platform/activity_relaunch.dart
Included review availability: This review used your included allowance. Your plan provides up to 4 included reviews per hour; 0 remain after this review.
The reason will be displayed to describe this comment to others. Learn more.
Hey - I've found 1 issue
Prompt for AI Agents
Please address the comments from this code review:
## Individual Comments### Comment 1
<locationpath="lib/platform/activity_relaunch.dart"line_range="24" />
<code_context>
+_navigator = navigator;
+ channel.setMethodCallHandler((call) async {
+ if (call.method != 'relaunched') return;+ _navigator?.call()?.popUntil((route) => route.isFirst);+ });
+ }
</code_context>
<issue_to_address>
**Launcher relaunch freezes during active capture**
When the launcher relaunch arrives while CalmBreathing is running or ECG capture is busy, `popUntil` repeatedly tries to pop the guarded route, but its `PopScope` rejects the pop; the loop cannot advance while the route remains topmost, so the UI isolate hangs and the app freezes.
Close guarded screens asynchronously before popping the remaining routes, or otherwise make relaunch stack clearing advance without retrying a pop that `PopScope` rejects.
</issue_to_address>
popUntil pops without asking, so reopening from the launcher during a
capture closed it. It now stops at a route whose PopScope says no; screens
above it are still closed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
Fixes the Android half of #650.
Why
On Android, closing the app (swiping it from recents) and opening it again from the launcher lands back on whatever screen was on top, e.g. inside Settings. The cause is deliberate plumbing:
MainActivityattaches to the engineEdgeApplicationcaches and never destroys (shouldDestroyEngineWithHost() = false), so background Bluetooth keeps running. The Activity goes, the Dart side and its Navigator stay, and the next Activity attaches to the same stack.On iOS the process ends, so a relaunch starts fresh on the saved tab with nothing pushed on top. This makes Android do the same.
Scope note: the issue asks to always open on Home. Reopening on the last tab is intentional on both platforms (
restoredShellTab()/Prefs.shellTabV2, "so an upgrade lands where the user was"), so this PR keeps it and only closes the screens pushed above the tab. If you'd rather always land on Today, that's a one-line follow-up in_ShellState.What changes
MainActivity.onCreate: notes whether the cached engine already existed beforeensureEngine. When it did, there is nosavedInstanceState, and the intent is the launcher's (ACTION_MAIN+CATEGORY_LAUNCHER), it invokesrelaunchedon a newopenstrap/activitychannel.savedInstanceState != null): Android recreated the Activity and the user expects the screen back.SELECT_NOTIFICATION, flutter_local_notifications 18.0.1), home_widget taps (HOME_WIDGET_LAUNCH_ACTION), or our ownStrapWidgetstap (no action): those keep routing as before.onCreate(configChangesin the manifest).lib/platform/activity_relaunch.dart(new): handlesrelaunchedbypopUntil(isFirst)on the root navigator.stop()only clears its own owner's handler, so a replaced owner'sdispose(which runs after its successor'sinitState) can't silence the successor.lib/app.dart(_ShellState): listens ininitState, stops indispose. The tab is untouched. A running workout stays reachable through the existing_LiveSessionBarabove every tab.Tests
test/activity_relaunch_test.dart(4 widget tests, driven through the real method channel):relaunchedcloses every pushed screen back to the tab; any other method does nothing; a disposed owner is a no-op; a replaced owner'sstopdoesn't remove its successor's handler.flutter analyze: no issues.flutter test --concurrency=1: 7047 passed, 28 skipped, 1 failed. The failure ishealth_workout_export_delete_gate_test, which fails on any macOS host on current main and is fixed by Pin the Health Connect delete-gate test to Health Connect (fails on macOS) #685 (it pins that test to Health Connect). Two files (synthetic_oura_day_test,whoop_fallback_night_banked_test) reported "did not complete" in that run while other tests were running on the same machine; re-run on their own, all 10 of their tests pass.Verified on an Android emulator (API 37, arm64, debug build; no band paired, onboarding skipped). The Activity was ended with
am stack remove <task>, which destroys it while the process (and the cached engine) stays alive, the same state as swiping the app away while the foreground service keeps the process. The PID was checked before and after each step.main@ 69341a6MAIN/LAUNCHER,LaunchState: WARM, same PID)act=SELECT_NOTIFICATION(the action flutter_local_notifications uses; no payload)The Kotlin compiles and runs. Not covered: a real notification tap end to end (no band, so the app posted none; the third row exercises the intent gate it depends on), and a physical device.
🤖 Generated with Claude Code
Summary by Sourcery
Reset stale Android navigation screens on launcher relaunches without changing intentional tab restoration or other launch flows.
New Features:
Bug Fixes:
Enhancements:
Tests:
Summary by CodeRabbit