Merge pull request #2974 from matrix-org/dbkr/fix_sso

Fix Single Sign-on
2019-05-15 14:12:05 +01:00
parent edc100163f fc636c6cb9
commit b4d2463d17
3 changed files with 24 additions and 3 deletions
--- a/src/MatrixClientPeg.js
+++ b/src/MatrixClientPeg.js
@@ -121,6 +121,7 @@ class MatrixClientPeg {
            // check that we have a version of the js-sdk which includes initCrypto
            if (this.matrixClient.initCrypto) {
                await this.matrixClient.initCrypto();
+                StorageManager.setCryptoInitialised(true);
            }
        } catch (e) {
            if (e && e.name === 'InvalidCryptoStoreError') {