From 3f72a590f56c41d8be7faeb79199140520cbb03e Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 1 Jun 2020 22:37:12 +0100
Subject: [PATCH] move e2ee-default switch to well-known from config.json

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/createRoom.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/createRoom.js b/src/createRoom.js
index 79e9a517ba..affdf196a7 100644
--- a/src/createRoom.js
+++ b/src/createRoom.js
@@ -23,8 +23,8 @@ import dis from "./dispatcher/dispatcher";
 import * as Rooms from "./Rooms";
 import DMRoomMap from "./utils/DMRoomMap";
 import {getAddressType} from "./UserAddress";
-import SettingsStore from "./settings/SettingsStore";
-import SdkConfig from "./SdkConfig";
+
+const E2EE_WK_KEY = "im.vector.riot.e2ee";
 
 /**
  * Create a new room, and switch to it.
@@ -238,5 +238,11 @@ export async function ensureDMExists(client, userId) {
 }
 
 export function privateShouldBeEncrypted() {
-    return SettingsStore.getValue("feature_cross_signing") && SdkConfig.get().e2ee_default_for_private_rooms !== false;
+    const clientWellKnown = MatrixClientPeg.get().getClientWellKnown();
+    if (clientWellKnown && clientWellKnown[E2EE_WK_KEY]) {
+        const defaultDisabled = clientWellKnown[E2EE_WK_KEY]["default"] === false;
+        return !defaultDisabled;
+    }
+
+    return true;
 }