mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Partially revert "Sender Key: Prepare for testing in beta"

Browse source 
Partial revert of commit ab5a12fded
This commit is contained in:
Scott Nonnenberg 2021-08-04 16:49:05 -07:00 • committed by GitHub
parent 674ea824c2
commit 3bbe859452
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ts/RemoteConfig.ts
View file

@ -19,6 +19,7 @@ export type ConfigKeyType =
| 'desktop.screensharing2' | 'desktop.screensharing2'
| 'desktop.senderKey.send' | 'desktop.senderKey.send'
| 'desktop.senderKey.retry' | 'desktop.senderKey.retry'
| 'desktop.sendSenderKey2'
| 'desktop.storage' | 'desktop.storage'
| 'desktop.storageWrite3' | 'desktop.storageWrite3'
| 'desktop.worksAtSignal' | 'desktop.worksAtSignal'

4
ts/background.ts
View file

@ -2314,7 +2314,9 @@ export async function startApp(): Promise<void> {
announcementGroup: true, announcementGroup: true,
'gv2-3': true, 'gv2-3': true,
'gv1-migration': true, 'gv1-migration': true,
senderKey: true, senderKey: window.Signal.RemoteConfig.isEnabled(
'desktop.sendSenderKey2'
),
}); });
} catch (error) { } catch (error) {
window.log.error( window.log.error(

10
ts/textsecure/WebAPI.ts
View file

@ -764,10 +764,10 @@ export type CapabilitiesType = {
senderKey: boolean; senderKey: boolean;
}; };
export type CapabilitiesUploadType = { export type CapabilitiesUploadType = {
announcementGroup: true; announcementGroup: boolean;
'gv2-3': true; 'gv2-3': boolean;
'gv1-migration': true; 'gv1-migration': boolean;
senderKey: true; senderKey: boolean;
}; };
type StickerPackManifestType = any; type StickerPackManifestType = any;
@ -1494,7 +1494,7 @@ export function initialize({
announcementGroup: true, announcementGroup: true,
'gv2-3': true, 'gv2-3': true,
'gv1-migration': true, 'gv1-migration': true,
senderKey: true, senderKey: false,
}; };
const { accessKey, uuid } = options; const { accessKey, uuid } = options;

2
ts/util/sendToGroup.ts
View file

@ -19,6 +19,7 @@ import {
SenderCertificateMode, SenderCertificateMode,
SendLogCallbackType, SendLogCallbackType,
} from '../textsecure/OutgoingMessage'; } from '../textsecure/OutgoingMessage';
import { isEnabled } from '../RemoteConfig';
import { isOlderThan } from './timestamp'; import { isOlderThan } from './timestamp';
import { import {
@ -146,6 +147,7 @@ export async function sendContentMessageToGroup({
const ourConversation = window.ConversationController.get(ourConversationId); const ourConversation = window.ConversationController.get(ourConversationId);
if ( if (
isEnabled('desktop.sendSenderKey2') &&
ourConversation?.get('capabilities')?.senderKey && ourConversation?.get('capabilities')?.senderKey &&
RemoteConfig.isEnabled('desktop.senderKey.send') && RemoteConfig.isEnabled('desktop.senderKey.send') &&
isGroupV2(conversation.attributes) isGroupV2(conversation.attributes)