Merge pull request #266 from jaoo/1078315

Bug 1078315 - [Loop] Incoming call continues ringing, when the call is answered from another device with the same FxAccount. r=frsela
(cherry picked from commit 97ac957)

app/call_screen/js/call_manager.js

@@ -16,6 +16,7 @@
   var _connectionTimeout;
   var _callProgressHelper = null;
   var _callee;
+  var _calleeJoined = false;
   var _isCalleeUnavailable = true;
   var _speakerManager;
   var _onhold = function noop() {};
@@ -109,10 +110,11 @@
           CallScreenUI.setCallStatus('calling');
           return;
         }
-
-        _perfDebug && PerfLog.log(_perfBranch,
-          'We send "accept" event through websocket');
-        callProgressHelper.accept();
+        if (_callee && _calleeJoined) {
+          _perfDebug && PerfLog.log(_perfBranch,
+            'We send "accept" event through websocket');
+          callProgressHelper.accept();
+        }
         break;
       case 'connecting':
         _perfDebug && PerfLog.log(_perfBranch,
@@ -180,6 +182,7 @@
         _callProgressHelper = null;
 
         if (!reason) {
+          _onpeercancel();
           return;
         }
         switch (reason) {
@@ -201,6 +204,7 @@
             _onpeerended();
             break;
           default:
+            _onpeercancel();
             break;
         }
         break;
@@ -487,6 +491,9 @@
         });
       });
 
+      if (_callee) {
+        _calleeJoined = true;
+      }
 
       window.addEventListener('offline', _dispatchNetworkError);
       _handleCallProgress(_callProgressHelper);
@@ -580,6 +587,8 @@
           );
         }
 
+        _calleeJoined = false;
+
         if (_callProgressHelper) {
           if (_isCallManagerInitialized) {
             _resolvePromise(error);

app/js/helpers/call_progress_helper.js

@@ -91,7 +91,7 @@
       if (that._state !== 'connected') {
         var message = {};
         that._state = message.state = 'terminated';
-        message.reason = 'Websocket onclose fired';
+        that._reason = message.reason = 'Websocket onclose fired';
         _callback(that._onerror, [message]);
         return;
       }
@@ -101,7 +101,7 @@
     this._ws.onerror = function onErrorWS(evt) {
       var message = {};
       that._state = message.state = 'terminated';
-      message.reason = 'Websocket onerror fired';
+      that._reason = message.reason = 'Websocket onerror fired';
       _callback(that._onerror, [message]);
     };
   }