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

Graceful calling lobby handling

Browse source
This commit is contained in:
Josh Perez 2023-07-27 20:29:10 -04:00 committed by GitHub
parent 4b1d7729d3
commit 1dc1a4d41b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ts/services/calling.ts
View file

@ -1783,8 +1783,6 @@ export class CallingClass {
await processGroupCallRingCancellation(ringId);
}
this.stopCallingLobby();
if (shouldRing) {
log.info('handleGroupCallRingUpdate: ringing');
this.reduxInterface?.receiveIncomingGroupCall({
@ -1888,8 +1886,6 @@ export class CallingClass {
this.attachToCall(conversation, call);
this.stopCallingLobby();
this.reduxInterface.receiveIncomingDirectCall({
conversationId: conversation.id,
isVideoCall: call.isVideoCall,

19
ts/state/ducks/calling.ts
View file

@ -1025,10 +1025,21 @@ function keyChangeOk(
function receiveIncomingDirectCall(
payload: IncomingDirectCallType
): IncomingDirectCallActionType {
return {
type: INCOMING_DIRECT_CALL,
payload,
): ThunkAction<void, RootStateType, unknown, IncomingDirectCallActionType> {
return (dispatch, getState) => {
const callState = getState().calling;
if (
callState.activeCallState &&
callState.activeCallState.conversationId === payload.conversationId
) {
calling.stopCallingLobby();
}
dispatch({
type: INCOMING_DIRECT_CALL,
payload,
});
};
}