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

Merge remote-tracking branch 'origin/develop' into webclient_initialSync

Browse source
This commit is contained in:
Emmanuel ROHEE 2014-09-10 18:35:05 +02:00
commit 44998ca450
13 changed files with 6407 additions and 3460 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -114,7 +114,7 @@ angular.module('MatrixCall', [])
};
matrixService.sendEvent(this.room_id, 'm.call.hangup', undefined, content).then(this.messageSent, this.messageSendFailed);
this.state = 'ended';
self.onHangup();
if (self.onHangup) self.onHangup(self);
};
MatrixCall.prototype.gotUserMediaForInvite = function(stream) {
@ -178,6 +178,10 @@ angular.module('MatrixCall', [])
MatrixCall.prototype.gotRemoteIceCandidate = function(cand) {
console.trace("Got ICE candidate from remote: "+cand);
if (this.state == 'ended') {
console.trace("Ignoring remote ICE candidate because call has ended");
return;
}
var candidateObject = new RTCIceCandidate({
sdpMLineIndex: cand.label,
candidate: cand.candidate
@ -294,10 +298,10 @@ angular.module('MatrixCall', [])
self = this;
$rootScope.$apply(function() {
self.state = 'ended';
this.hangupParty = 'remote';
self.hangupParty = 'remote';
self.stopAllMedia();
this.peerConn.close();
self.onHangup();
if (self.peerConn.signalingState != 'closed') self.peerConn.close();
if (self.onHangup) self.onHangup(self);
});
};
@ -313,7 +317,7 @@ angular.module('MatrixCall', [])
this.hangupParty = 'remote';
this.stopAllMedia();
this.peerConn.close();
this.onHangup();
if (this.onHangup) this.onHangup(self);
};
return MatrixCall;