Merge pull request #1813 from matrix-org/dbkr/cryptowarning

Show error if indexeddb store version is too new

Author: lukebarnard1

src/MatrixClientPeg.js

@@ -21,6 +21,7 @@ import utils from 'matrix-js-sdk/lib/utils';
 import EventTimeline from 'matrix-js-sdk/lib/models/event-timeline';
 import EventTimelineSet from 'matrix-js-sdk/lib/models/event-timeline-set';
 import createMatrixClient from './utils/createMatrixClient';
+import sdk from '.';
 
 interface MatrixClientCreds {
     homeserverUrl: string,
@@ -88,6 +89,25 @@ class MatrixClientPeg {
             // this can happen for a number of reasons, the most likely being
             // that the olm library was missing. It's not fatal.
             console.warn("Unable to initialise e2e: " + e);
+
+            if (e.name == 'VersionError') {
+                // XXX: import here to avoid cyclical dependencies
+                const Modal = require('./Modal');
+                const _t = require('./languageHandler')._t;
+                const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+                Modal.createTrackedDialog('New crypto data detected', '', ErrorDialog, {
+                    title: _t("Cryptography Disabled"),
+                    description: _t(
+                        "The cryptography data in this browser session is "+
+                        "too new for this version of Riot to understand. "+
+                        "Cryptography has been disabled. To re-enable it, go "+
+                        "back to the newer version of Riot. If you'd like to "+
+                        "use cryptography on this version, go back to the new "+
+                        "version, export your keys and log out, then return to "+
+                        "this version.",
+                    ),
+                });
+            }
         }
 
         const opts = utils.deepCopy(this.opts);

src/i18n/strings/en_EN.json

@@ -57,6 +57,8 @@
     "Failed to invite users to community": "Failed to invite users to community",
     "Failed to invite users to %(groupId)s": "Failed to invite users to %(groupId)s",
     "Failed to add the following rooms to %(groupId)s:": "Failed to add the following rooms to %(groupId)s:",
+    "Cryptography Disabled": "Cryptography Disabled",
+    "The cryptography data in this browser session is too new for this version of Riot to understand. Cryptography has been disabled. To re-enable it, go back to the newer version of Riot. If you'd like to use cryptography on this version, export your keys and log out of the newer version.": "The cryptography data in this browser session is too new for this version of Riot to understand. Cryptography has been disabled. To re-enable it, go back to the newer version of Riot. If you'd like to use cryptography on this version, export your keys and log out of the newer version.",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot does not have permission to send you notifications - please check your browser settings",
     "Riot was not given permission to send notifications - please try again": "Riot was not given permission to send notifications - please try again",
     "Unable to enable Notifications": "Unable to enable Notifications",
@@ -150,7 +152,6 @@
     "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s widget modified by %(senderName)s",
     "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s widget added by %(senderName)s",
     "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s widget removed by %(senderName)s",
-    "Communities": "Communities",
     "Message Pinning": "Message Pinning",
     "%(displayName)s is typing": "%(displayName)s is typing",
     "%(names)s and %(count)s others are typing|other": "%(names)s and %(count)s others are typing",
@@ -524,6 +525,7 @@
     "Unverify": "Unverify",
     "Verify...": "Verify...",
     "No results": "No results",
+    "Communities": "Communities",
     "Home": "Home",
     "Integrations Error": "Integrations Error",
     "Could not connect to the integration server": "Could not connect to the integration server",
@@ -859,10 +861,10 @@
     "Incorrect username and/or password.": "Incorrect username and/or password.",
     "Guest access is disabled on this Home Server.": "Guest access is disabled on this Home Server.",
     "The phone number entered looks invalid": "The phone number entered looks invalid",
+    "This homeserver doesn't offer any login flows which are supported by this client.": "This homeserver doesn't offer any login flows which are supported by this client.",
     "Error: Problem communicating with the given homeserver.": "Error: Problem communicating with the given homeserver.",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.",
-    "This homeserver doesn't offer any login flows which are supported by this client.": "This homeserver doesn't offer any login flows which are supported by this client.",
     "Login as guest": "Login as guest",
     "Return to app": "Return to app",
     "Failed to fetch avatar URL": "Failed to fetch avatar URL",