PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #4701 from matrix-org/bwindels/preventbootstrapfromkeybackuprestore

Browse source 
Prevent (double) 4S bootstrap from RestoreKeyBackupDialog
This commit is contained in:
Bruno Windels 2020-06-04 12:07:19 +00:00 committed by GitHub
commit 77b012e49b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
View file

@ -227,8 +227,10 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
loadError: null, loadError: null,
}); });
try { try {
const backupInfo = await MatrixClientPeg.get().getKeyBackupVersion(); const cli = MatrixClientPeg.get();
const backupKeyStored = await MatrixClientPeg.get().isKeyBackupKeyStored(); const backupInfo = await cli.getKeyBackupVersion();
const has4S = await cli.hasSecretStorageKey();
const backupKeyStored = has4S && await cli.isKeyBackupKeyStored();
this.setState({ this.setState({
backupInfo, backupInfo,
backupKeyStored, backupKeyStored,