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

Handle group calling event sync messages

Browse source
This commit is contained in:
Evan Hahn 2020-12-09 16:04:34 -06:00 • committed by GitHub
parent a142cb522e
commit 1098e59f87
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

37
ts/background.ts
View file

@ -2656,19 +2656,9 @@ type WhatIsThis = import('./window.d').WhatIsThis;
return Promise.resolve(); return Promise.resolve();
} }
if (data.message.groupCallUpdate) { if (handleGroupCallUpdateMessage(data.message, messageDescriptor)) {
if (data.message.groupV2 && messageDescriptor.type === Message.GROUP) {
if (window.isGroupCallingEnabled()) {
window.reduxActions.calling.peekNotConnectedGroupCall({
conversationId: messageDescriptor.id,
});
}
return Promise.resolve(); return Promise.resolve();
} }
window.log.warn(
'Received a group call update for a conversation that is not a GV2 group. Ignoring that property and continuing.'
);
}
// Don't wait for handleDataMessage, as it has its own per-conversation queueing // Don't wait for handleDataMessage, as it has its own per-conversation queueing
message.handleDataMessage(data.message, event.confirm); message.handleDataMessage(data.message, event.confirm);
@ -2952,6 +2942,10 @@ type WhatIsThis = import('./window.d').WhatIsThis;
return Promise.resolve(); return Promise.resolve();
} }
if (handleGroupCallUpdateMessage(data.message, messageDescriptor)) {
return Promise.resolve();
}
// Don't wait for handleDataMessage, as it has its own per-conversation queueing // Don't wait for handleDataMessage, as it has its own per-conversation queueing
message.handleDataMessage(data.message, event.confirm, { message.handleDataMessage(data.message, event.confirm, {
data, data,
@ -2983,6 +2977,27 @@ type WhatIsThis = import('./window.d').WhatIsThis;
} as WhatIsThis); } as WhatIsThis);
} }
// Returns `false` if this message isn't a group call message.
function handleGroupCallUpdateMessage(
message: DataMessageClass,
messageDescriptor: MessageDescriptor
): boolean {
if (message.groupCallUpdate) {
if (message.groupV2 && messageDescriptor.type === Message.GROUP) {
if (window.isGroupCallingEnabled()) {
window.reduxActions.calling.peekNotConnectedGroupCall({
conversationId: messageDescriptor.id,
});
}
return true;
}
window.log.warn(
'Received a group call update for a conversation that is not a GV2 group. Ignoring that property and continuing.'
);
}
return false;
}
async function unlinkAndDisconnect() { async function unlinkAndDisconnect() {
window.Whisper.events.trigger('unauthorized'); window.Whisper.events.trigger('unauthorized');