OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3956 from matrix-org/jryans/trigger-cs-lab-4s 

Enable cross-signing lab when key in storage
pull/21833/head
J. Ryan Stinnett 2020-01-28 14:13:04 +00:00 committed by GitHub
parent dea919f6ee 9cf59ab16d
commit a19cdc9077
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats 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,