From 54e235b0b9f47fd721d3ab556f6f35c29f9afca3 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 18 Jun 2020 10:42:33 +0100
Subject: [PATCH] Remove labs option to cache 'passphrase'

(which actually meant SSSS secrets)

Fixes https://github.com/vector-im/riot-web/issues/1392
---
 src/CrossSigningManager.js                                   | 5 +----
 .../views/settings/tabs/user/LabsUserSettingsTab.js          | 1 -
 src/settings/Settings.js                                     | 5 -----
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/CrossSigningManager.js b/src/CrossSigningManager.js
index d40f820ac0..b8a17c0f0d 100644
--- a/src/CrossSigningManager.js
+++ b/src/CrossSigningManager.js
@@ -34,10 +34,7 @@ let secretStorageBeingAccessed = false;
 let passphraseOnlyOption = null;
 
 function isCachingAllowed() {
-    return (
-        secretStorageBeingAccessed ||
-        SettingsStore.getValue("keepSecretStoragePassphraseForSession")
-    );
+    return secretStorageBeingAccessed;
 }
 
 export class AccessCancelledError extends Error {
diff --git a/src/components/views/settings/tabs/user/LabsUserSettingsTab.js b/src/components/views/settings/tabs/user/LabsUserSettingsTab.js
index 3e69107159..9724b9934f 100644
--- a/src/components/views/settings/tabs/user/LabsUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/LabsUserSettingsTab.js
@@ -66,7 +66,6 @@ export default class LabsUserSettingsTab extends React.Component {
                     <SettingsFlag name={"showHiddenEventsInTimeline"} level={SettingLevel.DEVICE} />
                     <SettingsFlag name={"lowBandwidth"} level={SettingLevel.DEVICE} />
                     <SettingsFlag name={"sendReadReceipts"} level={SettingLevel.ACCOUNT} />
-                    <SettingsFlag name={"keepSecretStoragePassphraseForSession"} level={SettingLevel.DEVICE} />
                 </div>
             </div>
         );
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 225af15ec8..5e439a1d71 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -521,11 +521,6 @@ export const SETTINGS = {
         displayName: _td("Enable message search in encrypted rooms"),
         default: true,
     },
-    "keepSecretStoragePassphraseForSession": {
-         supportedLevels: ['device', 'config'],
-         displayName: _td("Keep recovery passphrase in memory for this session"),
-         default: false,
-    },
     "crawlerSleepTime": {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
         displayName: _td("How fast should messages be downloaded."),