Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2024-12-26 07:29:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

Join rooms if we're not already in them when accepting a call coming from that room.

Browse Source 
SYWEB-55 #resolve
This commit is contained in:
David Baker 2014-09-19 17:21:17 +01:00
parent 68e534777c
commit f6258221c1
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
webclient/components/matrix/matrix-call.js
View File

@ -156,7 +156,22 @@ angular.module('MatrixCall', [])
MatrixCall.prototype.answer = function() {
console.log("Answering call "+this.call_id);
var self = this;
var roomMembers = $rootScope.events.rooms[this.room_id].members;
if (roomMembers[matrixService.config().user_id].membership != 'join') {
console.log("We need to join the room before we can accept this call");
matrixService.join(this.room_id).then(function() {
self.answer();
}, function() {
console.log("Failed to join room: can't answer call!");
self.onError("Unable to join room to answer call!");
self.hangup();
});
return;
}
if (!this.localAVStream && !this.waitForLocalAVStream) {
navigator.getUserMedia(this.getUserMediaVideoContraints(this.type), function(s) { self.gotUserMediaForAnswer(s); }, function(e) { self.getUserMediaFailed(e); });
this.state = 'wait_local_media';