Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-05 09:34:59 -04:00
Code Issues Projects Releases Packages Wiki Activity

Time out calls from both ends properly.

Browse source
This commit is contained in:
David Baker 2014-09-16 15:25:51 +01:00
parent 890178cf25
commit 84372cef4a
2 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

24
webclient/components/matrix/matrix-call.js
View file

@ -80,19 +80,29 @@ angular.module('MatrixCall', [])
this.config = config;
};
MatrixCall.prototype.initWithInvite = function(msg) {
this.msg = msg;
MatrixCall.prototype.initWithInvite = function(event) {
this.msg = event.content;
this.peerConn = this.createPeerConnection();
this.peerConn.setRemoteDescription(new RTCSessionDescription(this.msg.offer), this.onSetRemoteDescriptionSuccess, this.onSetRemoteDescriptionError);
this.state = 'ringing';
this.direction = 'inbound';
var self = this;
$timeout(function() {
if (self.state == 'ringing') {
self.state = 'ended';
self.hangupParty = 'remote'; // effectively
self.stopAllMedia();
if (self.peerConn.signalingState != 'closed') self.peerConn.close();
if (self.onHangup) self.onHangup(self);
}
}, this.msg.lifetime - event.age);
};
// perverse as it may seem, sometimes we want to instantiate a call with a hangup message
// (because when getting the state of the room on load, events come in reverse order and
// we want to remember that a call has been hung up)
MatrixCall.prototype.initWithHangup = function(msg) {
this.msg = msg;
MatrixCall.prototype.initWithHangup = function(event) {
this.msg = event.content;
this.state = 'ended';
};
@ -228,8 +238,10 @@ angular.module('MatrixCall', [])
var self = this;
$timeout(function() {
self.hangupReason = 'invite_timeout';
self.hangup();
if (self.state == 'invite_sent') {
self.hangupReason = 'invite_timeout';
self.hangup();
}
}, MatrixCall.CALL_TIMEOUT);
$rootScope.$apply(function() {