more logs to know who called stopNetwork

Former-commit-id: c0b661ae23953f80e287363ab24cf0f5ac05fbb1

4 files changed, 12 insertions, 11 deletions

diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js
index be1f0abf..ca811e9e 100644
--- a/www/js/EventModalCtrl.js
+++ b/www/js/EventModalCtrl.js
@@ -91,7 +91,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
      $rootScope.$on("auth-success", function () {
 
             ZMDataModel.zmDebug("EventModalCtrl: Re-login detected, resetting everything & re-generating connkey");
-             ZMDataModel.stopNetwork();
+             ZMDataModel.stopNetwork("Auth-Success inside EventModalCtrl");
             $scope.connKey =  (Math.floor((Math.random() * 999999) + 1)).toString();
             $timeout( function () { sendCommand('14',$scope.connKey, '&offset='+$scope.currentProgress);},500);
             //$timeout.cancel(eventQueryHandle);
@@ -641,6 +641,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
     };
 
     $scope.$on('$ionicView.enter', function () {
+        //console.log (">>>>>>>>>>>>>>>>>>>> MODAL VIEW ENTER");
 
 
 
@@ -703,7 +704,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
                 //$timeout.cancel(eventQueryHandle);
         ZMDataModel.zmDebug ("Modal removed - killing connkey");
         sendCommand(17,$scope.connKey);
-        $timeout (function(){ZMDataModel.stopNetwork();},400);
+        //$timeout (function(){ZMDataModel.stopNetwork("Modal removed inside EventModalCtrl");},400);
 
         // Execute action
     });
@@ -802,7 +803,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
         ZMDataModel.setLogin($scope.loginData);
         
         ZMDataModel.zmDebug("EventModalCtrl: gapless has changed resetting everything & re-generating connkey");
-             ZMDataModel.stopNetwork();
+             ZMDataModel.stopNetwork("EventModalCtrl-toggle gapless");
             $scope.connKey =  (Math.floor((Math.random() * 999999) + 1)).toString();
             $timeout( function () { sendCommand('14',$scope.connKey, '&offset='+$scope.currentProgress);},500);
             //$timeout.cancel(eventQueryHandle);
@@ -947,7 +948,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
         function outWithOld() {
 
             ZMDataModel.zmLog("ModalCtrl:Stopping network pull...");
-             ZMDataModel.stopNetwork();
+             ZMDataModel.stopNetwork("EventModalCtrl-out with old");
             $scope.animationInProgress = true;
             // give digest time for image to swap
             // 100 should be enough
@@ -991,7 +992,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
             function (error) {
                 
                     ZMDataModel.zmDebug("Hmm jump  error " + JSON.stringify(error));
-                     ZMDataModel.stopNetwork();
+                     ZMDataModel.stopNetwork("EventModalCtrl-jumptoEventZms error");
                     $scope.connKey =  (Math.floor((Math.random() * 999999) + 1)).toString();
                      $timeout( function () { sendCommand('14',$scope.connKey, '&offset='+$scope.currentProgress);},500);
                     ZMDataModel.zmDebug ("so I'm regenerating Connkey to " + $scope.connKey);
diff --git a/www/js/MonitorCtrl.js b/www/js/MonitorCtrl.js
index 6468ffd7..fc0956e2 100644
--- a/www/js/MonitorCtrl.js
+++ b/www/js/MonitorCtrl.js
@@ -407,7 +407,7 @@ angular.module('zmApp.controllers')
         // switch off awake, as liveview is finished
         ZMDataModel.setAwake(false);
         $scope.modal.remove();
-        $timeout (function() {ZMDataModel.zmLog("MonitorCtrl:Stopping network pull...");if (ZMDataModel.isForceNetworkStop())  ZMDataModel.stopNetwork();},300);
+        $timeout (function() {ZMDataModel.zmLog("MonitorCtrl:Stopping network pull...");if (ZMDataModel.isForceNetworkStop())  ZMDataModel.stopNetwork("MonitorCtrl-closeModal");},300);
         
         
     };
diff --git a/www/js/MonitorModalCtrl.js b/www/js/MonitorModalCtrl.js
index 6b4d7b42..31b2f0f6 100644
--- a/www/js/MonitorModalCtrl.js
+++ b/www/js/MonitorModalCtrl.js
@@ -110,7 +110,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
     $rootScope.$on("auth-success", function () {
 
             ZMDataModel.zmDebug("MonitorModalCtrl: Re-login detected, resetting everything & re-generating connkey");
-             ZMDataModel.stopNetwork();
+             ZMDataModel.stopNetwork("MonitorModal-auth success");
             $scope.connKey =  (Math.floor((Math.random() * 999999) + 1)).toString();
             
             
@@ -743,7 +743,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
         function outWithOld() {
 
             ZMDataModel.zmLog("ModalCtrl:Stopping network pull...");
-            ZMDataModel.stopNetwork();
+            ZMDataModel.stopNetwork("MonitorModal-outwithOld");
             $scope.rand = Math.floor((Math.random() * 100000) + 1);
             $scope.animationInProgress = true;
 
@@ -1285,7 +1285,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
         function outWithOld() {
 
             ZMDataModel.zmLog("ModalCtrl:Stopping network pull...");
-             ZMDataModel.stopNetwork();
+             ZMDataModel.stopNetwork("MonitorModal-outwithOld");
             $scope.animationInProgress = true;
             // give digest time for image to swap
             // 100 should be enough
diff --git a/www/js/MontageHistoryCtrl.js b/www/js/MontageHistoryCtrl.js
index b054437e..a43b4d6b 100644
--- a/www/js/MontageHistoryCtrl.js
+++ b/www/js/MontageHistoryCtrl.js
@@ -90,7 +90,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
             return;
         }
         
-         ZMDataModel.stopNetwork();
+         ZMDataModel.stopNetwork("MontageHistory-footerCollapse");
         var ld = ZMDataModel.getLogin();
         
         $scope.sliderVal.realRate = $scope.sliderVal.rate *100;
@@ -1255,7 +1255,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
         }   
         
         ZMDataModel.zmLog ("Forcing a window.stop() here");
-        ZMDataModel.stopNetwork();
+        ZMDataModel.stopNetwork("MontageHistory-beforeLeave");