From 81f06e2404ea42d1426ea34ce11ff2fb90ed8c29 Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@signal.org>
Date: Tue, 10 Aug 2021 17:41:27 -0700
Subject: [PATCH] Sender Key: Hardcode senderKey to true, during link and
 thereafter

---
 ts/background.ts                 |  4 +---
 ts/textsecure/MessageReceiver.ts |  5 +++--
 ts/textsecure/WebAPI.ts          | 10 +++++-----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/ts/background.ts b/ts/background.ts
index 4edc333ba7..147f9a1842 100644
--- a/ts/background.ts
+++ b/ts/background.ts
@@ -2349,9 +2349,7 @@ export async function startApp(): Promise<void> {
             announcementGroup: true,
             'gv2-3': true,
             'gv1-migration': true,
-            senderKey: window.Signal.RemoteConfig.isEnabled(
-              'desktop.sendSenderKey2'
-            ),
+            senderKey: true,
           });
         } catch (error) {
           window.log.error(
diff --git a/ts/textsecure/MessageReceiver.ts b/ts/textsecure/MessageReceiver.ts
index 4285178abe..a7845b7e94 100644
--- a/ts/textsecure/MessageReceiver.ts
+++ b/ts/textsecure/MessageReceiver.ts
@@ -1752,8 +1752,9 @@ export default class MessageReceiver
       }
     } catch (error) {
       window.log.error(
-        `maybeUpdateTimestamp/${timestamp}: Failed to process sender key ` +
-          `distribution message: ${Errors.toLogFormat(error)}`
+        `maybeUpdateTimestamp/${timestamp}: Failed to process message: ${Errors.toLogFormat(
+          error
+        )}`
       );
     }
 
diff --git a/ts/textsecure/WebAPI.ts b/ts/textsecure/WebAPI.ts
index 3863c62362..85ab5ccc9f 100644
--- a/ts/textsecure/WebAPI.ts
+++ b/ts/textsecure/WebAPI.ts
@@ -764,10 +764,10 @@ export type CapabilitiesType = {
   senderKey: boolean;
 };
 export type CapabilitiesUploadType = {
-  announcementGroup: boolean;
-  'gv2-3': boolean;
-  'gv1-migration': boolean;
-  senderKey: boolean;
+  announcementGroup: true;
+  'gv2-3': true;
+  'gv1-migration': true;
+  senderKey: true;
 };
 
 type StickerPackManifestType = any;
@@ -1494,7 +1494,7 @@ export function initialize({
         announcementGroup: true,
         'gv2-3': true,
         'gv1-migration': true,
-        senderKey: false,
+        senderKey: true,
       };
 
       const { accessKey, uuid } = options;