Skip to content

[stable-25.0.x] Adding confirmation prompt on leave conversation action - #6625

Merged
AndyScherzinger merged 3 commits into
stable-25.0.xfrom
claude/backport-6608-stable-25-ukl110
Sep 2, 2026
Merged

[stable-25.0.x] Adding confirmation prompt on leave conversation action#6625
AndyScherzinger merged 3 commits into
stable-25.0.xfrom
claude/backport-6608-stable-25-ukl110

Conversation

@AndyScherzinger

@AndyScherzinger AndyScherzinger commented Sep 2, 2026

Copy link
Copy Markdown
Member

Backport of PR #6608 to stable-25.0.x.

Cherry-picked commits (git cherry-pick -x, no conflicts):

  • 9c7d97d fix(conversationlist): Add confirmation dialog before leaving a conversation via swipe
  • d44bec1 fix(conversationlist): Replace leave confirmation dialog with undo snackbar
  • 08188ef style: Move leave-snackbar between navbar and fab/unread buttons

The resulting diff is byte-identical to the diff merged on master (5 files, +88/-39).

🏁 Checklist

  • ⛑️ Tests (unit and/or integration) are included or not needed
  • 🔖 Capability is checked or not needed
  • 🔙 Backport requests are created or not needed: /backport to stable-xx.x
  • 📅 Milestone is set
  • 🌸 PR title is meaningful (if it should be in the changelog: is it meaningful to users?)

🤖 AI (if applicable)

  • The content of this PR was partly or fully generated using AI

The cherry-pick and this description were prepared by Claude Code. No code was
authored by the agent — the commits are unmodified from #6608. ./gradlew detekt ktlintCheck could not be run in the agent environment (the sandbox network
policy blocks dl.google.com, so the Android Gradle plugin cannot be resolved);
CI on this PR covers it.

🤖 Generated with Claude Code

https://claude.ai/code/session_01DrPFzDqnNWQxofVNXMGxZE


Generated by Claude Code

rapterjet2004 and others added 3 commits September 2, 2026 17:08
…rsation via swipe

Swiping left on a conversation triggered leaving it immediately with
no way to confirm or cancel, making it easy to accidentally leave a
group. Show a confirmation dialog, matching the existing delete
conversation dialog pattern.

Fixes #6607

Signed-off-by: rapterjet2004 <[email protected]>
(cherry picked from commit 9c7d97d)
…ackbar

The blocking confirmation dialog interrupted the swipe-to-leave flow.
Show a snackbar with an Undo action instead, matching the pattern
email clients use. The room is hidden optimistically and the actual
leave request is only sent once the snackbar times out without being
undone, so leaving stays reversible even for rooms only a moderator
could re-add you to.

Addresses review feedback on #6607

Signed-off-by: rapterjet2004 <[email protected]>
(cherry picked from commit d44bec1)
Signed-off-by: Andy Scherzinger <[email protected]>
(cherry picked from commit 08188ef)
@github-actions

github-actions Bot commented Sep 2, 2026

Copy link
Copy Markdown
Contributor

APK file: https://github.com/nextcloud/talk-android/actions/runs/33659376564/artifacts/9858326850
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)

Copy link
Copy Markdown
Member Author

CI status note on this backport — the analysis failure is pre-existing and not caused by this change.

analysis — failing, not this PR's

The analysis itself passed. The job reports BUILD SUCCESSFUL, and the SpotBugs comparison came back found warnings: 88 / previous warnings: 88 / SUCCESS: count stayed the same. It then fails in the post-processing of scripts/analysis/analysis-wrapper.sh: a GitHub API call returns {"message": "Not Found", "status": "404"}, and the guard at line 62 trips with lint.html file is missing!, exiting 1. So app/build/reports/lint/lint.html is not being produced, independently of the diff.

This reproduces identically on unrelated PRs, including ones already merged:

Since the same failure appears on the very code this backport copies, already merged to master, it cannot be a product of the cherry-pick.

No fix ported. The fix belongs in scripts/analysis/, and touching CI tooling here would contradict the focused-scope rule in AGENTS.md ("Do not touch unrelated files"). I also did not re-run analysis: it fails deterministically on unrelated PRs, so a re-run would only repeat the result. This likely warrants its own issue against the analysis workflow.

test failed earlier for a different and unrelated reason — the GitHub Actions runner was shut down mid-compilation (The runner has received a shutdown signal), before any test executed. I re-ran it once; that re-run is still in progress.

Everything else is green, including check (detekt), check (ktlintCheck), qa, test (master, 29), reuse-compliance-check and DCO. Codacy reports action_required, which it also does on #6612.

The cherry-pick applied with no conflicts and the resulting diff is byte-identical to the diff merged in #6608 (5 files, +88/−39).


Generated by Claude Code

@AndyScherzinger AndyScherzinger added this to the 25.0.0 milestone Sep 2, 2026
@AndyScherzinger AndyScherzinger added the 3. to review Waiting for reviews label Sep 2, 2026
@AndyScherzinger
AndyScherzinger merged commit 7e4c3b0 into stable-25.0.x Sep 2, 2026
13 of 18 checks passed
@AndyScherzinger
AndyScherzinger deleted the claude/backport-6608-stable-25-ukl110 branch September 2, 2026 19:02
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.

2 participants