diff --git a/ts/background.ts b/ts/background.ts index 4edc333ba..147f9a184 100644 --- a/ts/background.ts +++ b/ts/background.ts @@ -2349,9 +2349,7 @@ export async function startApp(): Promise { 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 4285178ab..a7845b7e9 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 3863c6236..85ab5ccc9 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;