Add E2E_Enable_Encrypt_Files

RocketChat · Aug 28, 2024 · 8288bed · 8288bed
1 parent 3ba09b4
commit 8288bed
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/app/lib/constants/defaultSettings.ts b/app/lib/constants/defaultSettings.ts
@@ -105,6 +105,9 @@ export const defaultSettings = {
 	E2E_Enabled_Default_PrivateRooms: {
 		type: 'valueAsBoolean'
 	},
+	E2E_Enable_Encrypt_Files: {
+		type: 'valueAsBoolean'
+	},
 	Accounts_Directory_DefaultView: {
 		type: 'valueAsString'
 	},
@@ -249,10 +252,10 @@ export const defaultSettings = {
 	CDN_PREFIX: {
 		type: 'valueAsString'
 	},
-	Accounts_RequirePasswordConfirmation:{
+	Accounts_RequirePasswordConfirmation: {
 		type: 'valueAsBoolean'
 	},
-	Accounts_ConfirmPasswordPlaceholder:{
+	Accounts_ConfirmPasswordPlaceholder: {
 		type: 'valueAsString'
 	},
 	...deprecatedSettings

diff --git a/app/lib/encryption/encryption.ts b/app/lib/encryption/encryption.ts
@@ -531,7 +531,8 @@ class Encryption {
 			throw new Error('Subscription not found');
 		}
 
-		if (!subscription.encrypted) {
+		const { E2E_Enable_Encrypt_Files } = store.getState().settings;
+		if (!subscription.encrypted || !E2E_Enable_Encrypt_Files) {
 			// Send a non encrypted message
 			return { file };
 		}