From 72a9bda3b7d7a4a2c009a61a62518a8924c3a509 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 12 Apr 2021 14:57:21 -0600
Subject: [PATCH] One less try/catch

---
 .../security/AccessSecretStorageDialog.tsx    | 53 +++++++++----------
 1 file changed, 24 insertions(+), 29 deletions(-)

diff --git a/src/components/views/dialogs/security/AccessSecretStorageDialog.tsx b/src/components/views/dialogs/security/AccessSecretStorageDialog.tsx
index 7bc1e77459..ffe513581b 100644
--- a/src/components/views/dialogs/security/AccessSecretStorageDialog.tsx
+++ b/src/components/views/dialogs/security/AccessSecretStorageDialog.tsx
@@ -225,36 +225,31 @@ export default class AccessSecretStorageDialog extends React.PureComponent<IProp
         try {
             // Force reset secret storage (which resets the key backup)
             await accessSecretStorage(async () => {
-                try {
-                    // Now reset cross-signing so everything Just Works™ again.
-                    const cli = MatrixClientPeg.get();
-                    await cli.bootstrapCrossSigning({
-                        authUploadDeviceSigningKeys: async (makeRequest) => {
-                            // XXX: Making this an import breaks the app.
-                            const InteractiveAuthDialog = sdk.getComponent("views.dialogs.InteractiveAuthDialog");
-                            const {finished} = Modal.createTrackedDialog(
-                                'Cross-signing keys dialog', '', InteractiveAuthDialog,
-                                {
-                                    title: _t("Setting up keys"),
-                                    matrixClient: cli,
-                                    makeRequest,
-                                },
-                            );
-                            const [confirmed] = await finished;
-                            if (!confirmed) {
-                                throw new Error("Cross-signing key upload auth canceled");
-                            }
-                        },
-                        setupNewCrossSigning: true,
-                    });
+                // Now reset cross-signing so everything Just Works™ again.
+                const cli = MatrixClientPeg.get();
+                await cli.bootstrapCrossSigning({
+                    authUploadDeviceSigningKeys: async (makeRequest) => {
+                        // XXX: Making this an import breaks the app.
+                        const InteractiveAuthDialog = sdk.getComponent("views.dialogs.InteractiveAuthDialog");
+                        const {finished} = Modal.createTrackedDialog(
+                            'Cross-signing keys dialog', '', InteractiveAuthDialog,
+                            {
+                                title: _t("Setting up keys"),
+                                matrixClient: cli,
+                                makeRequest,
+                            },
+                        );
+                        const [confirmed] = await finished;
+                        if (!confirmed) {
+                            throw new Error("Cross-signing key upload auth canceled");
+                        }
+                    },
+                    setupNewCrossSigning: true,
+                });
 
-                    // Now we can indicate that the user is done pressing buttons, finally.
-                    // Upstream flows will detect the new secret storage, key backup, etc and use it.
-                    this.props.onFinished(true);
-                } catch (e) {
-                    console.error(e);
-                    this.props.onFinished(false);
-                }
+                // Now we can indicate that the user is done pressing buttons, finally.
+                // Upstream flows will detect the new secret storage, key backup, etc and use it.
+                this.props.onFinished(true);
             }, true);
         } catch (e) {
             console.error(e);