UI fixes in SessionRestoreErrorDialog

* Make the 'delete my data' button not the default
 * Make it red
 * Give it a confirmation dialog
 * Remove the 'cancel' button: what does it mean to cancel an error?
   In this case, it tried again and almost certainly got the same error.
 * Remove the top-right 'x' and don't cancel on esc for the same reason.
 * Move 'send bug report' to a button rather than a 'click here' link
 * Add a 'refresh' button which, even if it's no more likely to work,
   will at least look like it's doing something (it's mostly so if you
   don't have a bug report endpoint, there's still a button other
   than the one that deletes all your data).

src/components/views/dialogs/SessionRestoreErrorDialog.js

@@ -31,63 +31,73 @@ export default React.createClass({
         onFinished: PropTypes.func.isRequired,
     },
 
-    componentDidMount: function() {
-        if (this.refs.bugreportLink) {
-            this.refs.bugreportLink.focus();
-        }
-    },
-
     _sendBugReport: function() {
         const BugReportDialog = sdk.getComponent("dialogs.BugReportDialog");
         Modal.createTrackedDialog('Session Restore Error', 'Send Bug Report Dialog', BugReportDialog, {});
     },
 
-    _onContinueClick: function() {
-        this.props.onFinished(true);
+    _onClearStorageClick: function() {
+        const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
+        Modal.createTrackedDialog('Session Restore Confirm Logout', '', QuestionDialog, {
+            title: _t("Sign out"),
+            description:
+                <div>{ _t("Log out and remove encryption keys?") }</div>,
+            button: _t("Sign out"),
+            danger: true,
+            onFinished: this.props.onFinished,
+        });
     },
 
-    _onCancelClick: function() {
-        this.props.onFinished(false);
+    _onRefreshClick: function() {
+        // Is this likely to help? Probably not, but giving only one button
+        // that clears your storage seems awful.
+        window.location.reload(true);
     },
 
     render: function() {
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
-        let bugreport;
 
+        let dialogButtons;
         if (SdkConfig.get().bug_report_endpoint_url) {
-            bugreport = (
-                <p>
-                { _t(
-                    "Otherwise, <a>click here</a> to send a bug report.",
-                    {},
-                    { 'a': (sub) => <a ref="bugreportLink" onClick={this._sendBugReport}
-                    key="bugreport" href='#'>{ sub }</a> },
-                ) }
-                </p>
-            );
+            dialogButtons = <DialogButtons primaryButton={_t("Send Logs")}
+                onPrimaryButtonClick={this._sendBugReport}
+                focus={true}
+                hasCancel={false}
+            >
+                <button onClick={this._onClearStorageClick} className="danger">
+                    { _t("Clear Storage and Sign Out") }
+                </button>
+            </DialogButtons>
+        } else {
+            dialogButtons = <DialogButtons primaryButton={_t("Refresh")}
+                onPrimaryButtonClick={this._onRefreshClick}
+                focus={true}
+                hasCancel={false}
+            >
+                <button onClick={this._onClearStorageClick} className="danger">
+                    { _t("Clear Storage and Sign Out") }
+                </button>
+            </DialogButtons>
         }
-        const shouldFocusContinueButton =!(bugreport==true);
 
         return (
             <BaseDialog className="mx_ErrorDialog" onFinished={this.props.onFinished}
-                    title={_t('Unable to restore session')}
+                title={_t('Unable to restore session')}
                 contentId='mx_Dialog_content'
+                hasCancel={false}
             >
                 <div className="mx_Dialog_content" id='mx_Dialog_content'>
-                    <p>{ _t("We encountered an error trying to restore your previous session. If " +
-                    "you continue, you will need to log in again, and encrypted chat " +
-                    "history will be unreadable.") }</p>
+                    <p>{ _t("We encountered an error trying to restore your previous session.") }</p>
 
                     <p>{ _t("If you have previously used a more recent version of Riot, your session " +
                     "may be incompatible with this version. Close this window and return " +
                     "to the more recent version.") }</p>
 
-                    { bugreport }
+                    <p>{ _t("Clearing your browser's storage may fix the problem, but will sign you " +
+                    "out and cause any encrypted chat history to become unreadable.") }</p>
                 </div>
-                <DialogButtons primaryButton={_t("Continue anyway")}
-                    onPrimaryButtonClick={this._onContinueClick} focus={shouldFocusContinueButton}
-                    onCancel={this._onCancelClick} />
+                { dialogButtons }
             </BaseDialog>
         );
     },