Skip to content

fix: OTR session closing after 10 seconds without warning #29245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ggazzo merged 5 commits into from
May 31, 2023
Merged

fix: OTR session closing after 10 seconds without warning #29245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
636a917
bailout if there's a current handshake request ongoing
gabriellsh May 15, 2023
129977d
Merge branch 'develop' into fix/otrTimeout
gabriellsh May 22, 2023
7b0165e
add changeset
gabriellsh May 22, 2023
780967d
remove trace
gabriellsh May 30, 2023
59414c0
Merge branch 'develop' into fix/otrTimeout
gabriellsh May 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/curly-worms-impress.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

fix: OTR session closing after 10 seconds without warning
8 changes: 8 additions & 0 deletions apps/meteor/app/otr/client/OTRRoom.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,9 +289,17 @@ export class OTRRoom implements IOTRRoom {
this.reset();
await establishConnection();
} else {
/* We have to check if there's an in progress handshake request because
Notifications.notifyUser will sometimes dispatch 2 events */
if (this.getState() === OtrRoomState.REQUESTED) {
return;
}

if (this.getState() === OtrRoomState.ESTABLISHED) {
this.reset();
}

this.setState(OtrRoomState.REQUESTED);
imperativeModal.open({
component: GenericModal,
props: {
Expand Down
1 change: 1 addition & 0 deletions apps/meteor/app/otr/lib/OtrRoomState.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
export enum OtrRoomState {
DISABLED = 'DISABLED',
NOT_STARTED = 'NOT_STARTED',
REQUESTED = 'REQUESTED',
ESTABLISHING = 'ESTABLISHING',
ESTABLISHED = 'ESTABLISHED',
ERROR = 'ERROR',
Expand Down