From 7b0ab4a0591029a28d011c0d66e021d5694cbe05 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Fri, 9 Apr 2021 12:51:19 +0100
Subject: [PATCH 1/3] Enable sharing historical keys on invite

After discussion with Product, we're ready to enable this key sharing work from
https://github.com/matrix-org/matrix-react-sdk/pull/5763 (based on
https://github.com/matrix-org/matrix-doc/pull/3061).
---
 src/settings/Settings.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/settings/Settings.ts b/src/settings/Settings.ts
index 55fddc4a35..9ee267f39c 100644
--- a/src/settings/Settings.ts
+++ b/src/settings/Settings.ts
@@ -224,7 +224,7 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         isFeature: true,
         displayName: _td("Share decryption keys for room history when inviting users"),
         supportedLevels: LEVELS_FEATURE,
-        default: false,
+        default: true,
     },
     "advancedRoomListLogging": {
         // TODO: Remove flag before launch: https://github.com/vector-im/element-web/issues/14231

From bef5c6593e14eccdd93707010eaaf106559762b2 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Fri, 9 Apr 2021 17:05:55 +0100
Subject: [PATCH 2/3] Remove key sharing feature flag

---
 src/components/views/dialogs/InviteDialog.tsx | 6 ++----
 src/settings/Settings.ts                      | 6 ------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/components/views/dialogs/InviteDialog.tsx b/src/components/views/dialogs/InviteDialog.tsx
index a274f96a17..60f783e889 100644
--- a/src/components/views/dialogs/InviteDialog.tsx
+++ b/src/components/views/dialogs/InviteDialog.tsx
@@ -712,8 +712,7 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
                 this.props.onFinished();
             }
 
-            if (cli.isRoomEncrypted(this.props.roomId) &&
-                SettingsStore.getValue("feature_room_history_key_sharing")) {
+            if (cli.isRoomEncrypted(this.props.roomId)) {
                 const visibilityEvent = room.currentState.getStateEvents(
                     "m.room.history_visibility", "",
                 );
@@ -1344,8 +1343,7 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
             buttonText = _t("Invite");
             goButtonFn = this._inviteUsers;
 
-            if (SettingsStore.getValue("feature_room_history_key_sharing") &&
-                cli.isRoomEncrypted(this.props.roomId)) {
+            if (cli.isRoomEncrypted(this.props.roomId)) {
                 const room = cli.getRoom(this.props.roomId);
                 const visibilityEvent = room.currentState.getStateEvents(
                     "m.room.history_visibility", "",
diff --git a/src/settings/Settings.ts b/src/settings/Settings.ts
index 9ee267f39c..b38dee6e1a 100644
--- a/src/settings/Settings.ts
+++ b/src/settings/Settings.ts
@@ -220,12 +220,6 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         supportedLevels: LEVELS_FEATURE,
         default: false,
     },
-    "feature_room_history_key_sharing": {
-        isFeature: true,
-        displayName: _td("Share decryption keys for room history when inviting users"),
-        supportedLevels: LEVELS_FEATURE,
-        default: true,
-    },
     "advancedRoomListLogging": {
         // TODO: Remove flag before launch: https://github.com/vector-im/element-web/issues/14231
         displayName: _td("Enable advanced debugging for the room list"),

From fc0ee15924b30170957e53f8f279095389d3578a Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Fri, 9 Apr 2021 17:14:35 +0100
Subject: [PATCH 3/3] Update strings

---
 src/i18n/strings/en_EN.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index c192e51f96..c20ed4a512 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -800,7 +800,6 @@
     "Show message previews for reactions in DMs": "Show message previews for reactions in DMs",
     "Show message previews for reactions in all rooms": "Show message previews for reactions in all rooms",
     "Offline encrypted messaging using dehydrated devices": "Offline encrypted messaging using dehydrated devices",
-    "Share decryption keys for room history when inviting users": "Share decryption keys for room history when inviting users",
     "Enable advanced debugging for the room list": "Enable advanced debugging for the room list",
     "Show info about bridges in room settings": "Show info about bridges in room settings",
     "Font size": "Font size",