From fe5753179752b6e32b02a137c967c41059aee5c3 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 1 Apr 2022 15:46:27 +1100
Subject: [PATCH] Sesion 1.8.4 with calls enabled

---
 package.json                                  |  2 +-
 preload.js                                    |  1 -
 .../conversation/ConversationHeader.tsx       |  8 +------
 .../settings/section/CategoryPrivacy.tsx      | 21 +++++++++----------
 ts/receiver/contentMessage.ts                 |  2 +-
 ts/window.d.ts                                |  1 -
 6 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/package.json b/package.json
index b623cdb6d..d5b7c05cf 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "session-desktop",
   "productName": "Session",
   "description": "Private messaging from your desktop",
-  "version": "1.7.9",
+  "version": "1.8.4",
   "license": "GPL-3.0",
   "author": {
     "name": "Oxen Labs",
diff --git a/preload.js b/preload.js
index e3f05df0f..7f2148e5b 100644
--- a/preload.js
+++ b/preload.js
@@ -31,7 +31,6 @@ window.getNodeVersion = () => config.node_version;
 
 window.sessionFeatureFlags = {
   useOnionRequests: true,
-  useCallMessage: false,
 };
 
 window.versionInfo = {
diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx
index c8ae281d6..a8aa78d7a 100644
--- a/ts/components/conversation/ConversationHeader.tsx
+++ b/ts/components/conversation/ConversationHeader.tsx
@@ -210,13 +210,7 @@ const CallButton = () => {
   const hasOngoingCall = useSelector(getHasOngoingCall);
   const canCall = !(hasIncomingCall || hasOngoingCall);
 
-  if (
-    !isPrivate ||
-    isMe ||
-    !selectedConvoKey ||
-    isBlocked ||
-    !window.sessionFeatureFlags.useCallMessage
-  ) {
+  if (!isPrivate || isMe || !selectedConvoKey || isBlocked) {
     return null;
   }
 
diff --git a/ts/components/settings/section/CategoryPrivacy.tsx b/ts/components/settings/section/CategoryPrivacy.tsx
index 59288bada..a91e6a4a4 100644
--- a/ts/components/settings/section/CategoryPrivacy.tsx
+++ b/ts/components/settings/section/CategoryPrivacy.tsx
@@ -69,17 +69,16 @@ export const SettingsCategoryPrivacy = (props: {
           description={window.i18n('mediaPermissionsDescription')}
           active={Boolean(window.getSettingValue('media-permissions'))}
         />
-        {window.sessionFeatureFlags.useCallMessage && (
-          <SessionToggleWithDescription
-            onClickToggle={async () => {
-              await toggleCallMediaPermissions(forceUpdate);
-              forceUpdate();
-            }}
-            title={window.i18n('callMediaPermissionsTitle')}
-            description={window.i18n('callMediaPermissionsDescription')}
-            active={Boolean(window.getCallMediaPermissions())}
-          />
-        )}
+        <SessionToggleWithDescription
+          onClickToggle={async () => {
+            await toggleCallMediaPermissions(forceUpdate);
+            forceUpdate();
+          }}
+          title={window.i18n('callMediaPermissionsTitle')}
+          description={window.i18n('callMediaPermissionsDescription')}
+          active={Boolean(window.getCallMediaPermissions())}
+        />
+
         <SessionToggleWithDescription
           onClickToggle={() => {
             const old = Boolean(window.getSettingValue(SettingsKey.settingsReadReceipt));
diff --git a/ts/receiver/contentMessage.ts b/ts/receiver/contentMessage.ts
index d23fc9fb1..cb036428a 100644
--- a/ts/receiver/contentMessage.ts
+++ b/ts/receiver/contentMessage.ts
@@ -425,7 +425,7 @@ export async function innerHandleSwarmContentMessage(
     if (content.unsendMessage) {
       await handleUnsendMessage(envelope, content.unsendMessage as SignalService.Unsend);
     }
-    if (content.callMessage && window.sessionFeatureFlags?.useCallMessage) {
+    if (content.callMessage) {
       await handleCallMessage(envelope, content.callMessage as SignalService.CallMessage);
     }
     if (content.messageRequestResponse) {
diff --git a/ts/window.d.ts b/ts/window.d.ts
index bfb8aa8c7..c16fc0751 100644
--- a/ts/window.d.ts
+++ b/ts/window.d.ts
@@ -38,7 +38,6 @@ declare global {
     log: any;
     sessionFeatureFlags: {
       useOnionRequests: boolean;
-      useCallMessage: boolean;
     };
     SessionSnodeAPI: SessionSnodeAPI;
     onLogin: any;