From f100dcf1ec8ea439f56d1791e9846964cfc38c89 Mon Sep 17 00:00:00 2001 From: Kevin Aleman Date: Tue, 8 Oct 2024 09:24:17 -0600 Subject: [PATCH] revert waiting key logic --- apps/meteor/app/e2e/client/rocketchat.e2e.room.js | 2 +- apps/meteor/app/e2e/client/rocketchat.e2e.ts | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/apps/meteor/app/e2e/client/rocketchat.e2e.room.js b/apps/meteor/app/e2e/client/rocketchat.e2e.room.js index cf5bf34023976..401f9ddfd4688 100644 --- a/apps/meteor/app/e2e/client/rocketchat.e2e.room.js +++ b/apps/meteor/app/e2e/client/rocketchat.e2e.room.js @@ -36,7 +36,7 @@ const PAUSED = Symbol('PAUSED'); const permitedMutations = { [E2ERoomState.NOT_STARTED]: [E2ERoomState.ESTABLISHING, E2ERoomState.DISABLED, E2ERoomState.KEYS_RECEIVED], - [E2ERoomState.READY]: [E2ERoomState.DISABLED, E2ERoomState.CREATING_KEYS, E2ERoomState.WAITING_KEYS], + [E2ERoomState.READY]: [E2ERoomState.DISABLED, E2ERoomState.CREATING_KEYS], [E2ERoomState.ERROR]: [E2ERoomState.KEYS_RECEIVED, E2ERoomState.NOT_STARTED], [E2ERoomState.WAITING_KEYS]: [E2ERoomState.KEYS_RECEIVED, E2ERoomState.ERROR, E2ERoomState.DISABLED], [E2ERoomState.ESTABLISHING]: [ diff --git a/apps/meteor/app/e2e/client/rocketchat.e2e.ts b/apps/meteor/app/e2e/client/rocketchat.e2e.ts index 90426624bfdb4..df9e942d7f0df 100644 --- a/apps/meteor/app/e2e/client/rocketchat.e2e.ts +++ b/apps/meteor/app/e2e/client/rocketchat.e2e.ts @@ -27,7 +27,6 @@ import { getUserAvatarURL } from '../../utils/client'; import { sdk } from '../../utils/client/lib/SDKClient'; import { t } from '../../utils/lib/i18n'; import { E2EEState } from './E2EEState'; -import { E2ERoomState } from './E2ERoomState'; import { toString, toArrayBuffer, @@ -170,10 +169,6 @@ class E2E extends Emitter { } } - if (sub.encrypted && !sub.E2EKey && !sub.E2ESuggestedKey && !e2eRoom.isWaitingKeys()) { - e2eRoom.setState(E2ERoomState.WAITING_KEYS); - return; - } sub.encrypted ? e2eRoom.resume() : e2eRoom.pause(); // Cover private groups and direct messages