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

Move calling duration timer into redux state

Browse source
This commit is contained in:
Josh Perez 2020-10-13 17:02:43 -04:00 • committed by GitHub
parent 8a121f1ff7
commit 1507dea351
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ts/services/calling.ts
View file

@ -206,7 +206,7 @@ export class CallingClass {
this.attachToCall(conversation, call);
this.uxActions.outgoingCall({
callDetails: this.getUxCallDetails(conversation, call),
callDetails: this.getAcceptedCallDetails(conversation, call),
});
}
@ -702,7 +702,7 @@ export class CallingClass {
this.attachToCall(conversation, call);
this.uxActions.incomingCall({
callDetails: this.getUxCallDetails(conversation, call),
callDetails: this.getAcceptedCallDetails(conversation, call),
});
window.log.info('CallingClass.handleIncomingCall(): Proceeding');
@ -745,7 +745,7 @@ export class CallingClass {
}
uxActions.callStateChange({
callState: call.state,
callDetails: this.getUxCallDetails(conversation, call),
callDetails: this.getAcceptedCallDetails(conversation, call),
callEndedReason: call.endedReason,
});
};
@ -825,17 +825,18 @@ export class CallingClass {
};
}
private getUxCallDetails(
private getAcceptedCallDetails(
conversation: ConversationModel,
call: Call
): CallDetailsType {
const conversationProps = conversation.cachedProps;
if (!conversationProps) {
throw new Error('getUxCallDetails: No conversation props?');
throw new Error('getAcceptedCallDetails: No conversation props?');
}
return {
...conversationProps,
acceptedTime: Date.now(),
callId: call.callId,
isIncoming: call.isIncoming,
isVideoCall: call.isVideoCall,