matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-28 15:22:05 +03:00
Code Activity

Enable cross-signing lab when key in storage

Browse Source 
When we're starting a new session and find the cross-signing keys in secret
storage, auto-enable the lab for the new session.

Fixes https://github.com/vector-im/riot-web/issues/12100
This commit is contained in:
J. Ryan Stinnett
2020-01-28 12:30:39 +00:00
parent a168461e8b
commit 9cf59ab16d
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/structures/MatrixChat.js
View File

@ -1834,6 +1834,7 @@ export default createReactClass({
this._accountPassword = null; this._accountPassword = null;
this._accountPasswordTimer = null; this._accountPasswordTimer = null;
}, 60 * 5 * 1000); }, 60 * 5 * 1000);
// Wait for the client to be logged in (but not started) // Wait for the client to be logged in (but not started)
// which is enough to ask the server about account data. // which is enough to ask the server about account data.
const loggedIn = new Promise(resolve => { const loggedIn = new Promise(resolve => {
@ -1867,6 +1868,9 @@ export default createReactClass({
} }
if (masterKeyInStorage) { if (masterKeyInStorage) {
// Auto-enable cross-signing for the new session when key found in
// secret storage.
SettingsStore.setFeatureEnabled("feature_cross_signing", true);
this.setStateForNewView({ view: VIEWS.COMPLETE_SECURITY }); this.setStateForNewView({ view: VIEWS.COMPLETE_SECURITY });
} else if (SettingsStore.isFeatureEnabled("feature_cross_signing")) { } else if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
// This will only work if the feature is set to 'enable' in the config, // This will only work if the feature is set to 'enable' in the config,