From 4e98b5b4b60e150f4ed594b280a3fd733803ee40 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 28 Apr 2020 17:41:10 +0200
Subject: [PATCH] dont enable e2ee when inviting a 3pid

---
 src/components/views/dialogs/InviteDialog.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index a46fa0df07..a2a0eddd8e 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -577,10 +577,13 @@ export default class InviteDialog extends React.PureComponent {
         if (SettingsStore.getValue("feature_cross_signing")) {
             // Check whether all users have uploaded device keys before.
             // If so, enable encryption in the new room.
-            const client = MatrixClientPeg.get();
-            const allHaveDeviceKeys = await canEncryptToAllUsers(client, targetIds);
-            if (allHaveDeviceKeys) {
-                createRoomOptions.encryption = true;
+            const containsNonMatrixUsers = targets.some(t => !(t instanceof DirectoryMember));
+            if (!containsNonMatrixUsers) {
+                const client = MatrixClientPeg.get();
+                const allHaveDeviceKeys = await canEncryptToAllUsers(client, targetIds);
+                if (allHaveDeviceKeys) {
+                    createRoomOptions.encryption = true;
+                }
             }
         }