From 66714b29afbdf5d5ea73f0c26fdaaca116a4fd6b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 28 Aug 2019 11:37:20 +0100
Subject: [PATCH 1/2] expose power level toggle for enabling e2ee to room
 settings

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/settings/tabs/room/RolesRoomSettingsTab.js | 2 ++
 src/i18n/strings/en_EN.json                                     | 1 +
 2 files changed, 3 insertions(+)

diff --git a/src/components/views/settings/tabs/room/RolesRoomSettingsTab.js b/src/components/views/settings/tabs/room/RolesRoomSettingsTab.js
index c4b1ae8ddc..e269c6d2cd 100644
--- a/src/components/views/settings/tabs/room/RolesRoomSettingsTab.js
+++ b/src/components/views/settings/tabs/room/RolesRoomSettingsTab.js
@@ -30,6 +30,7 @@ const plEventsToLabels = {
     "m.room.history_visibility": _td("Change history visibility"),
     "m.room.power_levels": _td("Change permissions"),
     "m.room.topic": _td("Change topic"),
+    "m.room.encryption": _td("Enable room encryption"),
 
     "im.vector.modular.widgets": _td("Modify widgets"),
 };
@@ -42,6 +43,7 @@ const plEventsToShow = {
     "m.room.history_visibility": {isState: true},
     "m.room.power_levels": {isState: true},
     "m.room.topic": {isState: true},
+    "m.room.encryption": {isState: true},
 
     "im.vector.modular.widgets": {isState: true},
 };
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 62b6467b94..9ed4d4c4d9 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -680,6 +680,7 @@
     "Change history visibility": "Change history visibility",
     "Change permissions": "Change permissions",
     "Change topic": "Change topic",
+    "Enable room encryption": "Enable room encryption",
     "Modify widgets": "Modify widgets",
     "Failed to unban": "Failed to unban",
     "Unban": "Unban",

From 00a06af4194ad882e8fed8b9f2f622367350b3b2 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 30 Aug 2019 10:57:46 +0100
Subject: [PATCH 2/2] Hide the E2EE PL selector if room is already encrypted

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/settings/tabs/room/RolesRoomSettingsTab.js         | 5 +++++
 src/i18n/strings/en_EN.json                                  | 1 +
 2 files changed, 6 insertions(+)

diff --git a/src/components/views/settings/tabs/room/RolesRoomSettingsTab.js b/src/components/views/settings/tabs/room/RolesRoomSettingsTab.js
index 8aabc8d340..6b5fded674 100644
--- a/src/components/views/settings/tabs/room/RolesRoomSettingsTab.js
+++ b/src/components/views/settings/tabs/room/RolesRoomSettingsTab.js
@@ -306,6 +306,11 @@ export default class RolesRoomSettingsTab extends React.Component {
             </div>;
         });
 
+        // hide the power level selector for enabling E2EE if it the room is already encrypted
+        if (client.isRoomEncrypted(this.props.roomId)) {
+            delete eventsLevels["m.room.encryption"];
+        }
+
         const eventPowerSelectors = Object.keys(eventsLevels).map((eventType, i) => {
             let label = plEventsToLabels[eventType];
             if (label) {
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index ce4598ed5f..c28431bc26 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -681,6 +681,7 @@
     "Change permissions": "Change permissions",
     "Change topic": "Change topic",
     "Upgrade the room": "Upgrade the room",
+    "Enable room encryption": "Enable room encryption",
     "Modify widgets": "Modify widgets",
     "Failed to unban": "Failed to unban",
     "Unban": "Unban",