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

Merge remote-tracking branch 'upstream/develop' into task/dialogs-ts

Browse source 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
This commit is contained in:
Šimon Brandner 2021-09-22 10:42:02 +02:00
commit d3e340e7ce
No known key found for this signature in database
GPG key ID: 55C211A1226CB17D
194 changed files with 3881 additions and 17100 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/components/views/dialogs/security/RestoreKeyBackupDialog.tsx
View file

@ -24,6 +24,7 @@ import { IKeyBackupInfo, IKeyBackupRestoreResult } from "matrix-js-sdk/src/crypt
import { ISecretStorageKeyInfo } from "matrix-js-sdk/src/crypto/api";
import * as sdk from '../../../../index';
import { IDialogProps } from "../IDialogProps";
import { logger } from "matrix-js-sdk/src/logger";
enum RestoreType {
Passphrase = "passphrase",
@ -160,7 +161,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent<IProps,
recoverInfo,
});
} catch (e) {
console.log("Error restoring backup", e);
logger.log("Error restoring backup", e);
this.setState({
loading: false,
restoreError: e,
@ -194,7 +195,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent<IProps,
recoverInfo,
});
} catch (e) {
console.log("Error restoring backup", e);
logger.log("Error restoring backup", e);
this.setState({
loading: false,
restoreError: e,
@ -226,7 +227,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent<IProps,
loading: false,
});
} catch (e) {
console.log("Error restoring backup", e);
logger.log("Error restoring backup", e);
this.setState({
restoreError: e,
loading: false,
@ -248,7 +249,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent<IProps,
});
return true;
} catch (e) {
console.log("restoreWithCachedKey failed:", e);
logger.log("restoreWithCachedKey failed:", e);
return false;
}
}
@ -262,7 +263,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent<IProps,
const cli = MatrixClientPeg.get();
const backupInfo = await cli.getKeyBackupVersion();
const has4S = await cli.hasSecretStorageKey();
const backupKeyStored = has4S && await cli.isKeyBackupKeyStored();
const backupKeyStored = has4S && (await cli.isKeyBackupKeyStored());
this.setState({
backupInfo,
backupKeyStored,
@ -270,7 +271,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent<IProps,
const gotCache = await this.restoreWithCachedKey(backupInfo);
if (gotCache) {
console.log("RestoreKeyBackupDialog: found cached backup key");
logger.log("RestoreKeyBackupDialog: found cached backup key");
this.setState({
loading: false,
});
@ -287,7 +288,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent<IProps,
loading: false,
});
} catch (e) {
console.log("Error loading backup status", e);
logger.log("Error loading backup status", e);
this.setState({
loadError: e,
loading: false,