Merge pull request #5207 from matrix-org/travis/ui-func/e2e-icons

Remove defunct "always show encryption icons" setting
2020-09-15 08:52:19 -06:00
parent 9a3c30b1f1 0cac6874d4
commit d11ce5fade
5 changed files with 1 additions and 22 deletions
--- a/src/settings/Settings.ts
+++ b/src/settings/Settings.ts
@@ -275,11 +275,6 @@ export const SETTINGS: {[setting: string]: ISetting} = {
        displayName: _td('Autoplay GIFs and videos'),
        default: false,
    },
-    "alwaysShowEncryptionIcons": {
-        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
-        displayName: _td('Always show encryption icons'),
-        default: true,
-    },
    "showRoomRecoveryReminder": {
        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
        displayName: _td('Show a reminder to enable Secure Message Recovery in encrypted rooms'),