Merge pull request #5219 from matrix-org/jryans/defer-cross-signing-setup

Defer encryption setup until first E2EE room
2020-09-18 10:28:33 +01:00
parent d59a1fbd80 b5000b236f
commit ec4bf0c057
41 changed files with 458 additions and 486 deletions
--- a/src/settings/Settings.ts
+++ b/src/settings/Settings.ts
@@ -281,11 +281,6 @@ export const SETTINGS: {[setting: string]: ISetting} = {
        displayName: _td('Autoplay GIFs and videos'),
        default: false,
    },
-    "showRoomRecoveryReminder": {
-        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
-        displayName: _td('Show a reminder to enable Secure Message Recovery in encrypted rooms'),
-        default: true,
-    },
    "enableSyntaxHighlightLanguageDetection": {
        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
        displayName: _td('Enable automatic language detection for syntax highlighting'),