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

Fix legacy call-history messages without a callId

Browse source 
Co-authored-by: Scott Nonnenberg <scott@signal.org>
This commit is contained in:
Jamie Kyle 2023-08-16 17:11:09 -07:00 • committed by Jamie Kyle
parent 6f0401b847
commit ef0a3de636
17 changed files with 831 additions and 426 deletions
Download patch file Download diff file Expand all files Collapse all files

24
ts/state/selectors/message.ts
View file

@ -1317,6 +1317,14 @@ export type GetPropsForCallHistoryOptions = Pick<
| 'ourConversationId'
>;
const emptyCallNotification = {
callHistory: null,
callCreator: null,
callExternalState: CallExternalState.Ended,
maxDevices: Infinity,
deviceCount: 0,
};
export function getPropsForCallHistory(
message: MessageWithUIFieldsType,
{
@ -1328,17 +1336,15 @@ export function getPropsForCallHistory(
}: GetPropsForCallHistoryOptions
): CallingNotificationType {
const { callId } = message;
if (callId == null && 'callHistoryDetails' in message) {
log.error(
'getPropsForCallHistory: Found callHistoryDetails, but no callId'
);
if (callId == null) {
log.error('getPropsForCallHistory: Missing callId');
return emptyCallNotification;
}
strictAssert(callId != null, 'getPropsForCallHistory: Missing callId');
const callHistory = callHistorySelector(callId);
strictAssert(
callHistory != null,
'getPropsForCallHistory: Missing callHistory'
);
if (callHistory == null) {
log.error('getPropsForCallHistory: Missing callHistory');
return emptyCallNotification;
}
const conversation = conversationSelector(callHistory.peerId);
strictAssert(