chore: revert rocketchat.e2e.room changes

Author: dougfabris

apps/meteor/client/lib/chats/flows/uploadFiles.ts

@@ -58,7 +58,7 @@ export const uploadFiles = async (
 			return;
 		}
 
-		if (!(await e2eRoom.readyToEncrypt())) {
+		if (!e2eRoom.isReady()) {
 			uploadFile(file);
 			return;
 		}

apps/meteor/client/lib/e2ee/rocketchat.e2e.room.ts

@@ -8,7 +8,6 @@ import type {
 	AtLeast,
 	EncryptedMessageContent,
 	EncryptedContent,
-	IUpload,
 } from '@rocket.chat/core-typings';
 import { isEncryptedMessageContent } from '@rocket.chat/core-typings';
 import { Emitter } from '@rocket.chat/emitter';
@@ -28,7 +27,6 @@ import { sdk } from '../../../app/utils/client/lib/SDKClient';
 import { t } from '../../../app/utils/lib/i18n';
 import { RoomSettingsEnum } from '../../../definition/IRoomTypeConfig';
 import { Messages, Rooms, Subscriptions } from '../../stores';
-import type { EncryptedFile } from '../chats/Upload';
 import { roomCoordinator } from '../rooms/roomCoordinator';
 
 const log = createLogger('E2E:Room');
@@ -166,7 +164,7 @@ export class E2ERoom extends Emitter {
 		this.setState('KEYS_RECEIVED');
 	}
 
-	async readyToEncrypt() {
+	async shouldConvertSentMessages(message: { msg: string }) {
 		if (!this.isReady() || this[PAUSED]) {
 			return false;
 		}
@@ -177,17 +175,11 @@ export class E2ERoom extends Emitter {
 			});
 		}
 
-		return true;
-	}
-
-	async shouldConvertSentMessages(message: { msg: string }) {
-		if (!(await this.readyToEncrypt())) {
-			return false;
-		}
-
 		if (message.msg[0] === '/') {
 			return false;
 		}
+
+		return true;
 	}
 
 	shouldConvertReceivedMessages() {
@@ -580,7 +572,7 @@ export class E2ERoom extends Emitter {
 	}
 
 	// Encrypts files before upload. I/O is in arraybuffers.
-	async encryptFile(file: File): Promise<EncryptedFile | void> {
+	async encryptFile(file: File) {
 		const span = log.span('encryptFile');
 
 		const fileArrayBuffer = await file.arrayBuffer();
@@ -636,7 +628,7 @@ export class E2ERoom extends Emitter {
 
 	// Helper function for encryption of content
 	async encryptMessageContent(
-		contentToBeEncrypted: (Pick<IMessage, 'attachments' | 'files' | 'file'> & Optional<Pick<IMessage, 'msg'>, 'msg'>) | Partial<IUpload>,
+		contentToBeEncrypted: Pick<IMessage, 'attachments' | 'files' | 'file'> & Optional<Pick<IMessage, 'msg'>, 'msg'>,
 	) {
 		const data = new TextEncoder().encode(EJSON.stringify(contentToBeEncrypted));