Merge pull request #2427 from jryans/recovery-method-removed

Add separate dialog for recovery method removed

res/css/_components.scss

@@ -51,7 +51,7 @@
 @import "./views/dialogs/_ShareDialog.scss";
 @import "./views/dialogs/_UnknownDeviceDialog.scss";
 @import "./views/dialogs/keybackup/_CreateKeyBackupDialog.scss";
-@import "./views/dialogs/keybackup/_NewRecoveryMethodDialog.scss";
+@import "./views/dialogs/keybackup/_KeyBackupFailedDialog.scss";
 @import "./views/dialogs/keybackup/_RestoreKeyBackupDialog.scss";
 @import "./views/directory/_NetworkDropdown.scss";
 @import "./views/elements/_AccessibleButton.scss";

res/css/views/dialogs/keybackup/_KeyBackupFailedDialog.scss

@@ -14,11 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_NewRecoveryMethodDialog .mx_Dialog_title {
+.mx_KeyBackupFailedDialog .mx_Dialog_title {
     margin-bottom: 32px;
 }
 
-.mx_NewRecoveryMethodDialog_title {
+.mx_KeyBackupFailedDialog_title {
     position: relative;
     padding-left: 45px;
     padding-bottom: 10px;
@@ -36,6 +36,6 @@ limitations under the License.
     }
 }
 
-.mx_NewRecoveryMethodDialog .mx_Dialog_buttons {
+.mx_KeyBackupFailedDialog .mx_Dialog_buttons {
     margin-top: 36px;
 }

src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js

@@ -71,19 +71,20 @@ export default class NewRecoveryMethodDialog extends React.PureComponent {
     render() {
         const BaseDialog = sdk.getComponent("views.dialogs.BaseDialog");
         const DialogButtons = sdk.getComponent("views.elements.DialogButtons");
-        const title = <span className="mx_NewRecoveryMethodDialog_title">
+
+        const title = <span className="mx_KeyBackupFailedDialog_title">
             {_t("New Recovery Method")}
         </span>;
 
         return (
-            <BaseDialog className="mx_NewRecoveryMethodDialog"
+            <BaseDialog className="mx_KeyBackupFailedDialog"
                 onFinished={this.props.onFinished}
                 title={title}
             >
                 <div>
                     <p>{_t(
                         "A new recovery passphrase and key for Secure " +
-                        "Messages has been detected.",
+                        "Messages have been detected.",
                     )}</p>
                     <p>{_t(
                         "Setting up Secure Messages on this device " +

src/async-components/views/dialogs/keybackup/RecoveryMethodRemovedDialog.js

@@ -0,0 +1,80 @@
+/*
+Copyright 2019 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from "react";
+import PropTypes from "prop-types";
+import sdk from "../../../../index";
+import dis from "../../../../dispatcher";
+import { _t } from "../../../../languageHandler";
+import Modal from "../../../../Modal";
+
+export default class RecoveryMethodRemovedDialog extends React.PureComponent {
+    static propTypes = {
+        onFinished: PropTypes.func.isRequired,
+    }
+
+    onGoToSettingsClick = () => {
+        this.props.onFinished();
+        dis.dispatch({ action: 'view_user_settings' });
+    }
+
+    onSetupClick = () => {
+        this.props.onFinished();
+        Modal.createTrackedDialogAsync("Key Backup", "Key Backup",
+            import("./CreateKeyBackupDialog"),
+        );
+    }
+
+    render() {
+        const BaseDialog = sdk.getComponent("views.dialogs.BaseDialog");
+        const DialogButtons = sdk.getComponent("views.elements.DialogButtons");
+
+        const title = <span className="mx_KeyBackupFailedDialog_title">
+            {_t("Recovery Method Removed")}
+        </span>;
+
+        return (
+            <BaseDialog className="mx_KeyBackupFailedDialog"
+                onFinished={this.props.onFinished}
+                title={title}
+            >
+                <div>
+                    <p>{_t(
+                        "This device has detected that your recovery passphrase and key " +
+                        "for Secure Messages have been removed.",
+                    )}</p>
+                    <p>{_t(
+                        "If you did this accidentally, you can setup Secure Messages on " +
+                        "this device which will re-encrypt this device's message " +
+                        "history with a new recovery method.",
+                    )}</p>
+                    <p className="warning">{_t(
+                        "If you didn't remove the recovery method, an " +
+                        "attacker may be trying to access your account. " +
+                        "Change your account password and set a new recovery " +
+                        "method immediately in Settings.",
+                    )}</p>
+                    <DialogButtons
+                        primaryButton={_t("Set up Secure Messages")}
+                        onPrimaryButtonClick={this.onSetupClick}
+                        cancelButton={_t("Go to Settings")}
+                        onCancel={this.onGoToSettingsClick}
+                    />
+                </div>
+            </BaseDialog>
+        );
+    }
+}

src/components/structures/MatrixChat.js

@@ -1447,10 +1447,21 @@ export default React.createClass({
                     break;
             }
         });
-        cli.on("crypto.keyBackupFailed", () => {
+        cli.on("crypto.keyBackupFailed", (errcode) => {
-            Modal.createTrackedDialogAsync('New Recovery Method', 'New Recovery Method',
+            switch (errcode) {
-                import('../../async-components/views/dialogs/keybackup/NewRecoveryMethodDialog'),
+                case 'M_NOT_FOUND':
-            );
+                    Modal.createTrackedDialogAsync('Recovery Method Removed', 'Recovery Method Removed',
+                        import('../../async-components/views/dialogs/keybackup/RecoveryMethodRemovedDialog'),
+                    );
+                    return;
+                case 'M_WRONG_ROOM_KEYS_VERSION':
+                    Modal.createTrackedDialogAsync('New Recovery Method', 'New Recovery Method',
+                        import('../../async-components/views/dialogs/keybackup/NewRecoveryMethodDialog'),
+                    );
+                    return;
+                default:
+                    console.error(`Invalid key backup failure code: ${errcode}`);
+            }
         });
 
         // Fire the tinter right on startup to ensure the default theme is applied

src/i18n/strings/en_EN.json

@@ -1409,11 +1409,15 @@
     "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.",
     "If you don't want to set this up now, you can later in Settings.": "If you don't want to set this up now, you can later in Settings.",
     "New Recovery Method": "New Recovery Method",
-    "A new recovery passphrase and key for Secure Messages has been detected.": "A new recovery passphrase and key for Secure Messages has been detected.",
+    "A new recovery passphrase and key for Secure Messages have been detected.": "A new recovery passphrase and key for Secure Messages have been detected.",
     "Setting up Secure Messages on this device will re-encrypt this device's message history with the new recovery method.": "Setting up Secure Messages on this device will re-encrypt this device's message history with the new recovery method.",
     "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.",
     "Set up Secure Messages": "Set up Secure Messages",
     "Go to Settings": "Go to Settings",
+    "Recovery Method Removed": "Recovery Method Removed",
+    "This device has detected that your recovery passphrase and key for Secure Messages have been removed.": "This device has detected that your recovery passphrase and key for Secure Messages have been removed.",
+    "If you did this accidentally, you can setup Secure Messages on this device which will re-encrypt this device's message history with a new recovery method.": "If you did this accidentally, you can setup Secure Messages on this device which will re-encrypt this device's message history with a new recovery method.",
+    "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.",
     "Failed to set direct chat tag": "Failed to set direct chat tag",
     "Failed to remove tag %(tagName)s from room": "Failed to remove tag %(tagName)s from room",
     "Failed to add tag %(tagName)s to room": "Failed to add tag %(tagName)s to room"