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

Merge pull request #3862 from matrix-org/dbkr/catch_exception_cancel_passphrase

Browse source 
Catch exception if passphrase dialog cancelled
This commit is contained in:
David Baker 2020-01-17 15:43:21 +00:00 committed by GitHub
commit 6beae0ed39
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/components/structures/auth/CompleteSecurity.js
View file

@ -40,12 +40,16 @@ export default class CompleteSecurity extends React.Component {
onStartClick = async () => { onStartClick = async () => {
const cli = MatrixClientPeg.get(); const cli = MatrixClientPeg.get();
await accessSecretStorage(async () => { try {
await cli.checkOwnCrossSigningTrust(); await accessSecretStorage(async () => {
}); await cli.checkOwnCrossSigningTrust();
this.setState({ });
phase: PHASE_DONE, this.setState({
}); phase: PHASE_DONE,
});
} catch (e) {
// this will throw if the user hits cancel, so ignore
}
} }
onSkipClick = () => { onSkipClick = () => {