imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3880 from matrix-org/jryans/repair-cs-panel

Browse source 
Repair cross-signing panel with async status
This commit is contained in:
J. Ryan Stinnett 2020-01-21 10:56:13 +00:00 • committed by GitHub
commit ff8ee5cc7d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/components/views/settings/CrossSigningPanel.js
View file

@ -1,5 +1,5 @@
/* /*
Copyright 2019 The Matrix.org Foundation C.I.C. Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@ -29,7 +29,9 @@ export default class CrossSigningPanel extends React.PureComponent {
this.state = { this.state = {
error: null, error: null,
...this._getUpdatedStatus(), crossSigningPublicKeysOnDevice: false,
crossSigningPrivateKeysInStorage: false,
secretStorageKeyInAccount: false,
}; };
} }
@ -38,6 +40,7 @@ export default class CrossSigningPanel extends React.PureComponent {
cli.on("accountData", this.onAccountData); cli.on("accountData", this.onAccountData);
cli.on("userTrustStatusChanged", this.onStatusChanged); cli.on("userTrustStatusChanged", this.onStatusChanged);
cli.on("crossSigning.keysChanged", this.onStatusChanged); cli.on("crossSigning.keysChanged", this.onStatusChanged);
this._getUpdatedStatus();
} }
componentWillUnmount() { componentWillUnmount() {
@ -52,12 +55,12 @@ export default class CrossSigningPanel extends React.PureComponent {
onAccountData = (event) => { onAccountData = (event) => {
const type = event.getType(); const type = event.getType();
if (type.startsWith("m.cross_signing") || type.startsWith("m.secret_storage")) { if (type.startsWith("m.cross_signing") || type.startsWith("m.secret_storage")) {
this.setState(this._getUpdatedStatus()); this._getUpdatedStatus();
} }
}; };
onStatusChanged = () => { onStatusChanged = () => {
this.setState(this._getUpdatedStatus()); this._getUpdatedStatus();
}; };
async _getUpdatedStatus() { async _getUpdatedStatus() {
@ -69,11 +72,11 @@ export default class CrossSigningPanel extends React.PureComponent {
const crossSigningPrivateKeysInStorage = await crossSigning.isStoredInSecretStorage(secretStorage); const crossSigningPrivateKeysInStorage = await crossSigning.isStoredInSecretStorage(secretStorage);
const secretStorageKeyInAccount = await secretStorage.hasKey(); const secretStorageKeyInAccount = await secretStorage.hasKey();
return { this.setState({
crossSigningPublicKeysOnDevice, crossSigningPublicKeysOnDevice,
crossSigningPrivateKeysInStorage, crossSigningPrivateKeysInStorage,
secretStorageKeyInAccount, secretStorageKeyInAccount,
}; });
} }
/** /**
@ -93,7 +96,7 @@ export default class CrossSigningPanel extends React.PureComponent {
console.error("Error bootstrapping secret storage", e); console.error("Error bootstrapping secret storage", e);
} }
if (this._unmounted) return; if (this._unmounted) return;
this.setState(this._getUpdatedStatus()); this._getUpdatedStatus();
} }
render() { render() {