colin/Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

callStateChange: Properly handle ReceivedOfferWhileActive event

Browse Source
This commit is contained in:
Scott Nonnenberg
2025-03-21 08:23:18 +10:00
committed by GitHub
parent 121b60c0b5
commit b66efba169
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ts/state/ducks/calling.ts
View File

@@ -1195,7 +1195,18 @@ function callStateChange(
CallStateChangeFulfilledActionType CallStateChangeFulfilledActionType
> { > {
return async dispatch => { return async dispatch => {
const { callState, acceptedTime, callEndedReason } = payload; const { conversationId, callState, acceptedTime, callEndedReason } =
payload;
// This is a special case were we won't update our local call, because we have an
// ongoing active call. The ended call would stomp on the active call.
if (callEndedReason === CallEndedReason.ReceivedOfferWhileActive) {
const conversation = window.ConversationController.get(conversationId);
log.info(
`callStateChange: Got offer while active for conversation ${conversation?.idForLogging()}`
);
return;
}
const wasAccepted = acceptedTime != null; const wasAccepted = acceptedTime != null;
const isEnded = callState === CallState.Ended && callEndedReason != null; const isEnded = callState === CallState.Ended && callEndedReason != null;