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

Fix profile key oscillations in groups

Browse source
This commit is contained in:
Fedor Indutny 2023-09-07 01:28:32 +02:00 committed by GitHub
parent 1d07203fa9
commit ecab90041b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 39 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
ts/groups.ts
View file

@ -4925,10 +4925,17 @@ async function applyGroupChange({
);
}
newProfileKeys.push({
profileKey,
aci,
});
if (aci === sourceServiceId || !hasProfileKey(aci)) {
newProfileKeys.push({
profileKey,
aci,
});
} else {
log.warn(
`applyGroupChange/${logId}: Attempt to modify member profile key ` +
'failed; sourceServiceId is not the same as change aci'
);
}
});
// addPendingMembers?: Array<
@ -5433,6 +5440,16 @@ function profileKeyHasChanged(
return newBase64 !== existingBase64;
}
function hasProfileKey(userId: ServiceIdString) {
const conversation = window.ConversationController.get(userId);
if (!conversation) {
return true;
}
const existingBase64 = conversation.get('profileKey');
return existingBase64 !== undefined;
}
async function applyGroupState({
group,
groupState,
@ -5540,15 +5557,19 @@ async function applyGroupState({
}
const previousMember = members[member.userId];
if (
member.profileKey &&
(!previousMember ||
profileKeyHasChanged(member.userId, member.profileKey))
) {
if (member.profileKey && !hasProfileKey(member.userId)) {
newProfileKeys.push({
profileKey: member.profileKey,
aci: member.userId,
});
} else if (
member.profileKey &&
profileKeyHasChanged(member.userId, member.profileKey)
) {
log.warn(
`applyGroupState(${logId}): Member ${member.userId} had different profileKey`
);
otherChanges = true;
} else if (!previousMember) {
otherChanges = true;
}
@ -5634,15 +5655,19 @@ async function applyGroupState({
result.pendingAdminApprovalV2 = groupState.membersPendingAdminApproval.map(
member => {
const previousMember = pendingAdminApprovalMembers[member.userId];
if (
member.profileKey &&
(!previousMember ||
profileKeyHasChanged(member.userId, member.profileKey))
) {
if (member.profileKey && !hasProfileKey(member.userId)) {
newProfileKeys.push({
profileKey: member.profileKey,
aci: member.userId,
});
} else if (
member.profileKey &&
profileKeyHasChanged(member.userId, member.profileKey)
) {
log.warn(
`applyGroupState(${logId}): Member ${member.userId} had different profileKey`
);
otherChanges = true;
} else if (!previousMember) {
otherChanges = true;
}