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

Catch exception if passphrase dialog cancelled
2020-01-17 15:43:21 +00:00
parent 1a6be3addd d69c5f6a1b
commit 6beae0ed39
1 changed files with 10 additions and 6 deletions
--- a/src/components/structures/auth/CompleteSecurity.js
+++ b/src/components/structures/auth/CompleteSecurity.js
@@ -40,12 +40,16 @@ export default class CompleteSecurity extends React.Component {

    onStartClick = async () => {
        const cli = MatrixClientPeg.get();
-        await accessSecretStorage(async () => {
-            await cli.checkOwnCrossSigningTrust();
-        });
-        this.setState({
-            phase: PHASE_DONE,
-        });
+        try {
+            await accessSecretStorage(async () => {
+                await cli.checkOwnCrossSigningTrust();
+            });
+            this.setState({
+                phase: PHASE_DONE,
+            });
+        } catch (e) {
+            // this will throw if the user hits cancel, so ignore
+        }
    }

    onSkipClick = () => {