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

Removed gv1-migration

Browse source
This commit is contained in:
Alvaro 2022-12-05 10:42:13 -07:00 committed by GitHub
parent a0730dfaa4
commit 78ce34b9d3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ts/background.ts
View file

@ -2260,7 +2260,6 @@ export async function startApp(): Promise<void> {
announcementGroup: true, announcementGroup: true,
giftBadges: true, giftBadges: true,
'gv2-3': true, 'gv2-3': true,
'gv1-migration': true,
senderKey: true, senderKey: true,
changeNumber: true, changeNumber: true,
stories: true, stories: true,

23
ts/groups.ts
View file

@ -2149,23 +2149,11 @@ export async function getGroupMigrationMembers(
return null; return null;
} }
let capabilities = contact.get('capabilities');
// Refresh our local data to be sure // Refresh our local data to be sure
if ( if (!contact.get('profileKeyCredential')) {
!capabilities?.['gv1-migration'] ||
!contact.get('profileKeyCredential')
) {
await contact.getProfiles(); await contact.getProfiles();
} }
capabilities = contact.get('capabilities');
if (!capabilities?.['gv1-migration']) {
log.warn(
`getGroupMigrationMembers/${logId}: membersV2 - member ${e164} is missing gv1-migration capability, skipping.`
);
return null;
}
if (!contact.get('profileKeyCredential')) { if (!contact.get('profileKeyCredential')) {
log.warn( log.warn(
`getGroupMigrationMembers/${logId}: membersV2 - no profileKeyCredential for ${e164}, skipping.` `getGroupMigrationMembers/${logId}: membersV2 - no profileKeyCredential for ${e164}, skipping.`
@ -2224,15 +2212,6 @@ export async function getGroupMigrationMembers(
return null; return null;
} }
const capabilities = contact.get('capabilities');
if (!capabilities?.['gv1-migration']) {
log.warn(
`getGroupMigrationMembers/${logId}: pendingMembersV2 - member ${e164} is missing gv1-migration capability, skipping.`
);
droppedGV2MemberIds.push(conversationId);
return null;
}
if (conversationId === ourConversationId) { if (conversationId === ourConversationId) {
areWeInvited = true; areWeInvited = true;
} }

3
ts/textsecure/WebAPI.ts
View file

@ -609,7 +609,6 @@ export type WebAPIConnectType = {
export type CapabilitiesType = { export type CapabilitiesType = {
announcementGroup: boolean; announcementGroup: boolean;
giftBadges: boolean; giftBadges: boolean;
'gv1-migration': boolean;
senderKey: boolean; senderKey: boolean;
changeNumber: boolean; changeNumber: boolean;
stories: boolean; stories: boolean;
@ -618,7 +617,6 @@ export type CapabilitiesUploadType = {
announcementGroup: true; announcementGroup: true;
giftBadges: true; giftBadges: true;
'gv2-3': true; 'gv2-3': true;
'gv1-migration': true;
senderKey: true; senderKey: true;
changeNumber: true; changeNumber: true;
stories: true; stories: true;
@ -1856,7 +1854,6 @@ export function initialize({
announcementGroup: true, announcementGroup: true,
giftBadges: true, giftBadges: true,
'gv2-3': true, 'gv2-3': true,
'gv1-migration': true,
senderKey: true, senderKey: true,
changeNumber: true, changeNumber: true,
stories: true, stories: true,