Add a flag to control whether cross-signing signatures are trusted

Fixes: https://github.com/vector-im/riot-web/issues/12616
2020-03-25 18:38:12 +00:00
parent b7013c6f5d
commit 25e7bde7bc
6 changed files with 27 additions and 0 deletions
--- a/src/MatrixClientPeg.js
+++ b/src/MatrixClientPeg.js
@@ -148,6 +148,9 @@ class _MatrixClientPeg {
            // check that we have a version of the js-sdk which includes initCrypto
            if (!SettingsStore.getValue("lowBandwidth") && this.matrixClient.initCrypto) {
                await this.matrixClient.initCrypto();
+                this.matrixClient.setCryptoTrustCrossSignedDevices(
+                    !SettingsStore.getValue('e2ee.manuallyVerifyAllSessions'),
+                );
                StorageManager.setCryptoInitialised(true);
            }
        } catch (e) {