Skip to content

[stable-24.0] fix: navigate back to primary task when leaving permanent call room#6247

Merged
mahibi merged 1 commit into
stable-24.0from
backport/6235/stable-24.0
May 29, 2026
Merged

[stable-24.0] fix: navigate back to primary task when leaving permanent call room#6247
mahibi merged 1 commit into
stable-24.0from
backport/6235/stable-24.0

Conversation

@backportbot
Copy link
Copy Markdown

@backportbot backportbot Bot commented May 29, 2026

Backport of PR #6235

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>
@backportbot backportbot Bot requested a review from mahibi May 29, 2026 05:45
@backportbot backportbot Bot added the 3. to review Waiting for reviews label May 29, 2026
@backportbot backportbot Bot added this to the 24.0.0 milestone May 29, 2026
@github-actions
Copy link
Copy Markdown
Contributor

APK file: https://github.com/nextcloud/talk-android/actions/runs/26620476806/artifacts/7284107411
To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app.
qrcode (please click on link to get QR code displayed)

@mahibi mahibi merged commit 8acb6f7 into stable-24.0 May 29, 2026
11 of 15 checks passed
@mahibi mahibi deleted the backport/6235/stable-24.0 branch May 29, 2026 07:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to review Waiting for reviews

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant