From 76fe87c941fd20185932907ffc598b54ae559b48 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 13 Jan 2020 17:41:58 +0000
Subject: [PATCH] Don't error on unverifie/unknownd devices.

When cross-signing is enabled, we no longer want to fail and
prompt the user to ack every device in the room. All the info should
be conveyed in the shield colour (although isn't fully just yet).

Fixes https://github.com/vector-im/riot-web/issues/11750
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1150
---
 src/components/structures/MatrixChat.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index af3f4d2598..ce6f7d936f 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1506,6 +1506,15 @@ export default createReactClass({
             );
             cli.setGlobalBlacklistUnverifiedDevices(blacklistEnabled);
         }
+
+        // With cross-signing enabled, we send to unknown devices
+        // without prompting. Any bad-device status the user should
+        // be aware of will be signalled through the room shield
+        // changing colour. More advanced behaviour will come once
+        // we implement more settings.
+        cli.setGlobalErrorOnUnknownDevices(
+            !SettingsStore.isFeatureEnabled("feature_cross_signing")
+        );
     },
 
     showScreen: function(screen, params) {