fix: navigate back to primary task when leaving permanent call room#6235
Merged
mahibi merged 1 commit intoMay 28, 2026
Merged
Conversation
When multiple app instances run in separate tasks (e.g. opened via a notification), leaving a voice/permanent call room previously started a new ConversationsListActivity on top of the call task instead of returning to the existing app task. This caused duplicate task stacks. Now the call task finds the existing primary task (preferring one rooted at MainActivity) and navigates it to ConversationsListActivity, removes any stray non-call tasks, and uses finishAndRemoveTask() to fully clean up the call task. Falls back to launching MainActivity fresh if no existing task is found. AI-assistant: Claude Code v2.1.142 (Claude Sonnet 4.6) Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
Contributor
|
APK file: https://github.com/nextcloud/talk-android/actions/runs/26574220445/artifacts/7266756672 |
Member
|
/backport to stable-24.0 |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The permanent call rooms implementation is a bit complex which causes multiple app instances being opened.
This PR will fix the problem with the multiple app instances, however it adds more complexity. For now, this should be the best solution but we may have to think about an other approach for permanent call rooms.
Also, this fix requires API level 29 which is a problem.
What was done in this PR:
When multiple app instances run in separate tasks (e.g. opened via a notification), leaving a voice/permanent call room previously started a new ConversationsListActivity on top of the call task instead of returning to the existing app task. This caused duplicate task stacks.
Now the call task finds the existing primary task (preferring one rooted at MainActivity) and navigates it to ConversationsListActivity, removes any stray non-call tasks, and uses finishAndRemoveTask() to fully clean up the call task. Falls back to launching MainActivity fresh if no existing task is found.
AI-assistant: Claude Code v2.1.142 (Claude Sonnet 4.6)
🏁 Checklist
/backport to stable-xx.x