matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-28 05:03:59 +03:00
Code Activity

Honour a call reject event from another of our own devices

Browse Source 
Fixes a bug where the call would ring again when you refreshed,
even though you'd previously rejected it.
This commit is contained in:
David Baker
2020-12-18 13:45:13 +00:00
parent 035cb9fe08
commit b6f42b25dd
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/webrtc/call.ts
View File

@@ -446,6 +446,7 @@ export class MatrixCall extends EventEmitter {
*/ */
async initWithInvite(event: MatrixEvent) { async initWithInvite(event: MatrixEvent) {
this.msg = event.getContent(); this.msg = event.getContent();
this.direction = CallDirection.Inbound;
this.peerConn = this.createPeerConnection(); this.peerConn = this.createPeerConnection();
try { try {
await this.peerConn.setRemoteDescription(this.msg.offer); await this.peerConn.setRemoteDescription(this.msg.offer);
@@ -467,7 +468,6 @@ export class MatrixCall extends EventEmitter {
this.type = this.remoteStream.getTracks().some(t => t.kind === 'video') ? CallType.Video : CallType.Voice; this.type = this.remoteStream.getTracks().some(t => t.kind === 'video') ? CallType.Video : CallType.Voice;
this.setState(CallState.Ringing); this.setState(CallState.Ringing);
this.direction = CallDirection.Inbound;
this.opponentVersion = this.msg.version; this.opponentVersion = this.msg.version;
this.opponentPartyId = this.msg.party_id || null; this.opponentPartyId = this.msg.party_id || null;
this.opponentMember = event.sender; this.opponentMember = event.sender;
@@ -1314,7 +1314,16 @@ export class MatrixCall extends EventEmitter {
// No need to check party_id for reject because if we'd received either // No need to check party_id for reject because if we'd received either
// an answer or reject, we wouldn't be in state InviteSent // an answer or reject, we wouldn't be in state InviteSent
if (this.state === CallState.InviteSent) { const shouldTerminate = (
// reject events also end the call if it's ringing: it's another of
// our devices rejecting the call.
([CallState.InviteSent, CallState.Ringing].includes(this.state)) ||
// also if we're in the init state and it's an inbound call, since
// this means we just haven't entered the ringing state yet
this.state === CallState.Fledgling && this.direction === CallDirection.Inbound
);
if (shouldTerminate) {
this.terminate(CallParty.Remote, CallErrorCode.UserHangup, true); this.terminate(CallParty.Remote, CallErrorCode.UserHangup, true);
} else { } else {
logger.debug(`Call is in state: ${this.state}: ignoring reject`); logger.debug(`Call is in state: ${this.state}: ignoring reject`);