fixed an issue with double call of _acceptInternal

Author: Igor Khomenko

js/modules/webrtc/qbRTCPeerConnection.js

@@ -39,7 +39,7 @@ RTCPeerConnection.prototype.init = function(delegate, userID, sessionID, type) {
   this.sessionID = sessionID;
   this.userID = userID;
   this.type = type;
-  this.sdp = null;
+  this.remoteSDP = null;
 
   this.state = RTCPeerConnection.State.NEW;
 
@@ -64,7 +64,18 @@ RTCPeerConnection.prototype.release = function(){
   if(this.signalingState !== 'closed'){
     this.close();
   }
-}
+};
+
+RTCPeerConnection.prototype.updateRemoteSDP = function(newSDP){
+  if(!newSDP){
+    throw new Error("sdp string can't be empty.");
+  }
+  this.remoteSDP = newSDP;
+};
+
+RTCPeerConnection.prototype.getRemoteSDP = function(){
+  return this.remoteSDP;
+};
 
 RTCPeerConnection.prototype.setRemoteSessionDescription = function(type, remoteSessionDescription, callback){
   var desc = new RTCSessionDescription({sdp: remoteSessionDescription, type: type});
@@ -110,10 +121,6 @@ RTCPeerConnection.prototype.getAndSetLocalSessionDescription = function(callback
   }
 };
 
-RTCPeerConnection.prototype.updateSDP = function(newSDP){
-  this.sdp = newSDP;
-}
-
 RTCPeerConnection.prototype.addCandidates = function(iceCandidates) {
   var candidate;
   for (var i = 0, len = iceCandidates.length; i < len; i++) {

js/modules/webrtc/qbWebRTCSession.js

@@ -74,7 +74,7 @@ function WebRTCSession(sessionID, initiatorID, opIDs, callType, signalingProvide
  */
 WebRTCSession.prototype.getUserMedia = function(params, callback) {
   var getUserMedia = navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia;
-  
+
   if(!getUserMedia) {
     throw new Error('getUserMedia() is not supported in your browser');
   }
@@ -267,7 +267,7 @@ WebRTCSession.prototype._acceptInternal = function(userID, extension) {
   if(peerConnection){
     peerConnection.addLocalStream(this.localStream);
 
-    peerConnection.setRemoteSessionDescription('offer', peerConnection.sdp, function(error){
+    peerConnection.setRemoteSessionDescription('offer', peerConnection.getRemoteSDP(), function(error){
       if(error){
         Helpers.traceError("'setRemoteSessionDescription' error: " + error);
       }else{
@@ -314,7 +314,7 @@ WebRTCSession.prototype.reject = function(extension) {
   ext["opponentsIDs"] = self.opponentsIDs;
 
   var peersLen = Object.keys(self.peerConnections).length;
-  
+
   if(peersLen > 0){
     for (var key in self.peerConnections) {
       var peerConnection = self.peerConnections[key];
@@ -449,17 +449,19 @@ WebRTCSession.prototype.processOnCall = function(callerID, extension) {
   this._clearWaitingOfferOrAnswerTimer();
 
   var oppIDs = this._uniqueOpponentsIDs();
-  oppIDs.forEach(function(opID, i, arr) {
+    oppIDs.forEach(function(opID, i, arr) {
 
     var peerConnection = self.peerConnections[opID];
     if(peerConnection){
-      peerConnection.updateSDP(extension.sdp);
+      if(opID == callerID){
+        peerConnection.updateRemoteSDP(extension.sdp);
 
-      // The group call logic starts here
-      if(callerID != self.initiatorID && self.state === WebRTCSession.State.ACTIVE){
-        self._acceptInternal(callerID, {});
-      }
+        // The group call logic starts here
+        if(callerID != self.initiatorID && self.state === WebRTCSession.State.ACTIVE){
+          self._acceptInternal(callerID, {});
+        }
 
+      }
     } else {
       // create peer connections for each opponent
       var peerConnection;
@@ -468,14 +470,16 @@ WebRTCSession.prototype.processOnCall = function(callerID, extension) {
       }else{
         peerConnection = self._createPeer(opID, 'answer');
       }
+
       self.peerConnections[opID] = peerConnection;
 
       if(opID == callerID){
-        peerConnection.updateSDP(extension.sdp);
+        peerConnection.updateRemoteSDP(extension.sdp);
         self._startAnswerTimer();
       }
     }
   });
+
 };
 
 WebRTCSession.prototype.processOnAccept = function(userID, extension) {

quickblox.min.js

@@ -201,7 +201,7 @@ <h4>Call from <strong class="j-ic_initiator"></strong></h4>
         </li>
     </script>
 
-    
+
     <script type="text/template" id="accept_call">
         <%  _.each(users, function(el, i, list) { %>
             <% if(list.length === 1){ %>
@@ -213,7 +213,7 @@ <h4>Call from <strong class="j-ic_initiator"></strong></h4>
                     <b><%= el.full_name %></b>,
                 <% } %>
             <% } %>
-        <% }); %> 
+        <% }); %>
     </script>
 
     <script type="text/template" id="login_tpl">
@@ -253,7 +253,7 @@ <h4>Call from <strong class="j-ic_initiator"></strong></h4>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore-min.js"></script>
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>
 
-    <script src="../../quickblox.min.js"></script>
+    <script src="../../quickblox.js"></script>
 
     <script src="config.js"></script>
     <script src="app.js"></script>