diff --git a/packages/lib/models/settings/builtInMetadata.ts b/packages/lib/models/settings/builtInMetadata.ts index b366c11aac..b257b2e697 100644 --- a/packages/lib/models/settings/builtInMetadata.ts +++ b/packages/lib/models/settings/builtInMetadata.ts @@ -1716,17 +1716,6 @@ const builtInMetadata = (Setting: typeof SettingType) => { // storage: SettingStorage.File, // }, - 'featureFlag.useBetaEncryptionMethod': { - value: false, - type: SettingItemType.Bool, - public: true, - storage: SettingStorage.File, - label: () => 'Use beta encryption', - description: () => 'Set beta encryption methods as the default methods. This applies to all clients and takes effect after restarting the app.', - section: 'sync', - isGlobal: true, - }, - 'featureFlag.richText.useStrictContentSecurityPolicy': { value: true, type: SettingItemType.Bool, diff --git a/packages/lib/services/e2ee/EncryptionService.ts b/packages/lib/services/e2ee/EncryptionService.ts index e67118e7d1..82579b09a4 100644 --- a/packages/lib/services/e2ee/EncryptionService.ts +++ b/packages/lib/services/e2ee/EncryptionService.ts @@ -72,9 +72,9 @@ export default class EncryptionService { private encryptedMasterKeys_: Map = new Map(); private decryptedMasterKeys_: Map = new Map(); - public defaultEncryptionMethod_ = Setting.value('featureFlag.useBetaEncryptionMethod') ? EncryptionMethod.StringV1 : EncryptionMethod.SJCL1a; // public because used in tests - public defaultFileEncryptionMethod_ = Setting.value('featureFlag.useBetaEncryptionMethod') ? EncryptionMethod.FileV1 : EncryptionMethod.SJCL1a; // public because used in tests - private defaultMasterKeyEncryptionMethod_ = Setting.value('featureFlag.useBetaEncryptionMethod') ? EncryptionMethod.KeyV1 : EncryptionMethod.SJCL4; + public defaultEncryptionMethod_ = EncryptionMethod.StringV1; // public because used in tests + public defaultFileEncryptionMethod_ = EncryptionMethod.FileV1; // public because used in tests + private defaultMasterKeyEncryptionMethod_ = EncryptionMethod.KeyV1; private encryptionNonce_: Uint8Array = null;