Skip to content

fix: Prevent re-joining room when leaving chat#2401

Merged
SystemKeeper merged 2 commits intomainfrom
fix/noid/prevent-rejoining-room-when-leaving-chat
Mar 2, 2026
Merged

fix: Prevent re-joining room when leaving chat#2401
SystemKeeper merged 2 commits intomainfrom
fix/noid/prevent-rejoining-room-when-leaving-chat

Conversation

@Ivansss
Copy link
Copy Markdown
Member

@Ivansss Ivansss commented Feb 20, 2026

Steps to reproduce:

  • Join one open conversation
  • Go to "Conversation settings"
  • Tap on "Leave conversation"

Without this PR:

User will rejoin the conversation after leaving it, because the chat view will rejoin the conversation (in viewWillAppear()) while moving to conversations list.

With this PR:
Prevents any action on chat view's viewWillAppear() if leaveChat() has been called.

@Ivansss Ivansss requested a review from SystemKeeper February 20, 2026 18:05
@Ivansss Ivansss marked this pull request as draft February 20, 2026 18:06
@Ivansss Ivansss marked this pull request as ready for review February 24, 2026 09:20
@SystemKeeper
Copy link
Copy Markdown
Collaborator

SystemKeeper commented Feb 25, 2026

I guess we can't just reuse the hasStopped flag?

Signed-off-by: Ivan Sein <ivan@nextcloud.com>
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
@Ivansss Ivansss force-pushed the fix/noid/prevent-rejoining-room-when-leaving-chat branch from 9ba6ee5 to 1fd3cce Compare February 27, 2026 17:12
@Ivansss
Copy link
Copy Markdown
Member Author

Ivansss commented Mar 2, 2026

/backport to stable23 please

Copy link
Copy Markdown
Collaborator

@SystemKeeper SystemKeeper left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for adding the test 💛

@SystemKeeper SystemKeeper merged commit 424671b into main Mar 2, 2026
15 of 17 checks passed
@SystemKeeper SystemKeeper deleted the fix/noid/prevent-rejoining-room-when-leaving-chat branch March 2, 2026 22:38
@SystemKeeper
Copy link
Copy Markdown
Collaborator

/backport to stable23 please

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants