a few tweaks to do foo....

35 files changed, 26 insertions, 15 deletions

diff --git a/GoogleService-Info.plist b/GoogleService-Info.plist
index eb3a19e2..bbdb0546 100644
--- a/GoogleService-Info.plist
+++ b/GoogleService-Info.plist
@@ -23,7 +23,7 @@
 	<key>STORAGE_BUCKET</key>
 	<string>ninja-1105.appspot.com</string>
 	<key>IS_ADS_ENABLED</key>
-	<true></true>
+	<false></false>
 	<key>IS_ANALYTICS_ENABLED</key>
 	<false></false>
 	<key>IS_APPINVITE_ENABLED</key>
@@ -37,4 +37,4 @@
 	<key>DATABASE_URL</key>
 	<string>https://ninja-1105.firebaseio.com</string>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/package.json b/package.json
index d5c68dd0..ef197b47 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "zmninjapro",
   "description": "Home security mobile app for ZoneMinder",
-  "version": "1.3.026",
+  "version":"1.3.026",
   "displayName": "zmNinja",
   "author": "Pliable Pixels",
   "license": "custom see LICENSE.md",
@@ -59,7 +59,6 @@
   "dependencies": {
     "clivas": "^0.2.0",
     "cordova-android": "^6.4.0",
-    "cordova-ios": "~4.5.5",
     "cordova-library-helper-pp-fork": "^1.0.1",
     "cordova-plugin-add-swift-support": "^1.7.2",
     "cordova-plugin-advanced-http": "^2.0.1",
@@ -99,7 +98,8 @@
     "minimist": "^1.2.0",
     "mkdirp": "^0.5.1",
     "phonegap-plugin-mobile-accessibility": "^1.0.5",
-    "phonegap-plugin-push": "~2.1.3"
+    "phonegap-plugin-push": "~2.1.3",
+    "cordova-ios": "~4.5.5"
   },
   "devDependencies": {
     "bower": "^1.8.4",
@@ -175,4 +175,4 @@
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/resources/ios/icon/icon-1024.png b/resources/ios/icon/icon-1024.png
index 8ce1f586..704b7761 100644
--- a/resources/ios/icon/icon-1024.png
+++ b/resources/ios/icon/icon-1024.png
diff --git a/resources/ios/icon/icon-40.png b/resources/ios/icon/icon-40.png
index 992e4347..d7725e1d 100644
--- a/resources/ios/icon/icon-40.png
+++ b/resources/ios/icon/icon-40.png
diff --git a/resources/ios/icon/icon-40@2x.png b/resources/ios/icon/icon-40@2x.png
index 88e9093f..5ca2be43 100644
--- a/resources/ios/icon/icon-40@2x.png
+++ b/resources/ios/icon/icon-40@2x.png
diff --git a/resources/ios/icon/icon-40@3x.png b/resources/ios/icon/icon-40@3x.png
index 0eb2d14f..4de4a6af 100644
--- a/resources/ios/icon/icon-40@3x.png
+++ b/resources/ios/icon/icon-40@3x.png
diff --git a/resources/ios/icon/icon-50.png b/resources/ios/icon/icon-50.png
index cb772e83..64321ced 100644
--- a/resources/ios/icon/icon-50.png
+++ b/resources/ios/icon/icon-50.png
diff --git a/resources/ios/icon/icon-50@2x.png b/resources/ios/icon/icon-50@2x.png
index 03ee7ed4..605af249 100644
--- a/resources/ios/icon/icon-50@2x.png
+++ b/resources/ios/icon/icon-50@2x.png
diff --git a/resources/ios/icon/icon-60.png b/resources/ios/icon/icon-60.png
index 74f726ca..ba8c562e 100644
--- a/resources/ios/icon/icon-60.png
+++ b/resources/ios/icon/icon-60.png
diff --git a/resources/ios/icon/icon-60@2x.png b/resources/ios/icon/icon-60@2x.png
index 0eb2d14f..4de4a6af 100644
--- a/resources/ios/icon/icon-60@2x.png
+++ b/resources/ios/icon/icon-60@2x.png
diff --git a/resources/ios/icon/icon-60@3x.png b/resources/ios/icon/icon-60@3x.png
index 7574996d..524f40f3 100644
--- a/resources/ios/icon/icon-60@3x.png
+++ b/resources/ios/icon/icon-60@3x.png
diff --git a/resources/ios/icon/icon-72.png b/resources/ios/icon/icon-72.png
index a2d820df..fdb8c370 100644
--- a/resources/ios/icon/icon-72.png
+++ b/resources/ios/icon/icon-72.png
diff --git a/resources/ios/icon/icon-72@2x.png b/resources/ios/icon/icon-72@2x.png
index 3338ca7f..3967f6da 100644
--- a/resources/ios/icon/icon-72@2x.png
+++ b/resources/ios/icon/icon-72@2x.png
diff --git a/resources/ios/icon/icon-76.png b/resources/ios/icon/icon-76.png
index 133f22f2..740949d7 100644
--- a/resources/ios/icon/icon-76.png
+++ b/resources/ios/icon/icon-76.png
diff --git a/resources/ios/icon/icon-76@2x.png b/resources/ios/icon/icon-76@2x.png
index cc8edd0a..bb5c9414 100644
--- a/resources/ios/icon/icon-76@2x.png
+++ b/resources/ios/icon/icon-76@2x.png
diff --git a/resources/ios/icon/icon-83.5@2x.png b/resources/ios/icon/icon-83.5@2x.png
index fb75f8f9..572991ad 100644
--- a/resources/ios/icon/icon-83.5@2x.png
+++ b/resources/ios/icon/icon-83.5@2x.png
diff --git a/resources/ios/icon/icon-small.png b/resources/ios/icon/icon-small.png
index 79cd46a1..9e585fac 100644
--- a/resources/ios/icon/icon-small.png
+++ b/resources/ios/icon/icon-small.png
diff --git a/resources/ios/icon/icon-small@2x.png b/resources/ios/icon/icon-small@2x.png
index 8251efd0..b278d966 100644
--- a/resources/ios/icon/icon-small@2x.png
+++ b/resources/ios/icon/icon-small@2x.png
diff --git a/resources/ios/icon/icon-small@3x.png b/resources/ios/icon/icon-small@3x.png
index 46c34cc5..dbfb81ee 100644
--- a/resources/ios/icon/icon-small@3x.png
+++ b/resources/ios/icon/icon-small@3x.png
diff --git a/resources/ios/icon/icon.png b/resources/ios/icon/icon.png
index 742116e2..10519e5b 100644
--- a/resources/ios/icon/icon.png
+++ b/resources/ios/icon/icon.png
diff --git a/resources/ios/icon/icon@2x.png b/resources/ios/icon/icon@2x.png
index 6eb4742d..f7b5379d 100644
--- a/resources/ios/icon/icon@2x.png
+++ b/resources/ios/icon/icon@2x.png
diff --git a/resources/ios/splash/Default-568h@2x~iphone.png b/resources/ios/splash/Default-568h@2x~iphone.png
index b987bfaa..9621e689 100644
--- a/resources/ios/splash/Default-568h@2x~iphone.png
+++ b/resources/ios/splash/Default-568h@2x~iphone.png
diff --git a/resources/ios/splash/Default-667h.png b/resources/ios/splash/Default-667h.png
index ba037c77..795c5ddd 100644
--- a/resources/ios/splash/Default-667h.png
+++ b/resources/ios/splash/Default-667h.png
diff --git a/resources/ios/splash/Default-736h.png b/resources/ios/splash/Default-736h.png
index 456327ee..90de1194 100644
--- a/resources/ios/splash/Default-736h.png
+++ b/resources/ios/splash/Default-736h.png
diff --git a/resources/ios/splash/Default-Landscape-736h.png b/resources/ios/splash/Default-Landscape-736h.png
index ba79a715..157cb864 100644
--- a/resources/ios/splash/Default-Landscape-736h.png
+++ b/resources/ios/splash/Default-Landscape-736h.png
diff --git a/resources/ios/splash/Default-Landscape@2x~ipad.png b/resources/ios/splash/Default-Landscape@2x~ipad.png
index 9000638f..1a2ea075 100644
--- a/resources/ios/splash/Default-Landscape@2x~ipad.png
+++ b/resources/ios/splash/Default-Landscape@2x~ipad.png
diff --git a/resources/ios/splash/Default-Landscape@~ipadpro.png b/resources/ios/splash/Default-Landscape@~ipadpro.png
index 5ed46f67..3dfe4e6b 100644
--- a/resources/ios/splash/Default-Landscape@~ipadpro.png
+++ b/resources/ios/splash/Default-Landscape@~ipadpro.png
diff --git a/resources/ios/splash/Default-Landscape~ipad.png b/resources/ios/splash/Default-Landscape~ipad.png
index bc6d1502..794ec783 100644
--- a/resources/ios/splash/Default-Landscape~ipad.png
+++ b/resources/ios/splash/Default-Landscape~ipad.png
diff --git a/resources/ios/splash/Default-Portrait@2x~ipad.png b/resources/ios/splash/Default-Portrait@2x~ipad.png
index 39f7f9de..7d0ab461 100644
--- a/resources/ios/splash/Default-Portrait@2x~ipad.png
+++ b/resources/ios/splash/Default-Portrait@2x~ipad.png
diff --git a/resources/ios/splash/Default-Portrait@~ipadpro.png b/resources/ios/splash/Default-Portrait@~ipadpro.png
index e0685076..2a83c59e 100644
--- a/resources/ios/splash/Default-Portrait@~ipadpro.png
+++ b/resources/ios/splash/Default-Portrait@~ipadpro.png
diff --git a/resources/ios/splash/Default-Portrait~ipad.png b/resources/ios/splash/Default-Portrait~ipad.png
index df205911..cfb3b1cd 100644
--- a/resources/ios/splash/Default-Portrait~ipad.png
+++ b/resources/ios/splash/Default-Portrait~ipad.png
diff --git a/resources/ios/splash/Default@2x~iphone.png b/resources/ios/splash/Default@2x~iphone.png
index 5fde545a..05c6b1a6 100644
--- a/resources/ios/splash/Default@2x~iphone.png
+++ b/resources/ios/splash/Default@2x~iphone.png
diff --git a/resources/ios/splash/Default@2x~universal~anyany.png b/resources/ios/splash/Default@2x~universal~anyany.png
index 77108330..f29a57dd 100644
--- a/resources/ios/splash/Default@2x~universal~anyany.png
+++ b/resources/ios/splash/Default@2x~universal~anyany.png
diff --git a/resources/ios/splash/Default~iphone.png b/resources/ios/splash/Default~iphone.png
index 0a72e96b..e087c794 100644
--- a/resources/ios/splash/Default~iphone.png
+++ b/resources/ios/splash/Default~iphone.png
diff --git a/www/js/app.js b/www/js/app.js
index a6023fa8..8a8cfd55 100755
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -1515,12 +1515,16 @@ angular.module('zmApp', [
         //navigator.app.exitApp();
 
       };
-
+ 
       // This is a global exception interceptor
       $rootScope.exceptionMessage = function (error) {
         NVRDataModel.debug("**EXCEPTION**" + error.reason + " caused by " + error.cause);
       };
 
+      // for .config block
+      $rootScope.debug = function (msg) {
+        NVRDataModel.debug(msg);
+      };
 
       if ($rootScope.platformOS == 'desktop' && 0) {
 
@@ -1663,12 +1667,16 @@ angular.module('zmApp', [
       // lets see if it really works
       $rootScope.online = navigator.onLine;
 
-      NVRDataModel.log ("--------->Setting up network state handlers....");
+      // set up network state handlers after 3secs
+      // android seems to howl about this at app start?
+      $timeout (function() {
+
+        NVRDataModel.log ("--------->Setting up network state handlers....");
       document.addEventListener("offline", function () {
         //console.log ("OFFLINE------------------------------------");
         $timeout(function () {
           $rootScope.online = false;
-          NVRDataModel.log("Your network went offline");
+          NVRDataModel.log("************** Your network went offline");
 
           //$rootScope.$emit('network-change', "offline");
 
@@ -1679,14 +1687,13 @@ angular.module('zmApp', [
         //console.log ("ONLINE------------------------------------");
         $timeout(function () {
 
-
-          NVRDataModel.log("Your network came back online");
+          NVRDataModel.log("************ Your network came back online");
 
           $rootScope.online = true;
 
           $timeout(function () {
             // NVRDataModel.debug ("Ignoring - Alex R. Hack");
-            if (0) {
+            if (1) {
               var networkState = "browser not supported";
               if (navigator.connection) networkState = navigator.connection.type;
               NVRDataModel.debug("Detected network type as: " + networkState);
@@ -1711,6 +1718,9 @@ angular.module('zmApp', [
         });
       }, false);
 
+      },3000);
+      
+
       // This code takes care of trapping the Android back button
       // and takes it to the menu.
       //console.log (">>>>>>>>>>>>>>>>>>BACK BUTTON REGISTERED");
@@ -2263,7 +2273,7 @@ angular.module('zmApp', [
   //------------------------------------------------------------------
 
   // My route map connecting menu options to their respective templates and controllers
-  .config(function ($stateProvider, $urlRouterProvider, $httpProvider, $ionicConfigProvider, $provide, $compileProvider, /*$ionicNativeTransitionsProvider,*/ $logProvider, $translateProvider) {
+  .config(function ($stateProvider, $urlRouterProvider, $httpProvider, $ionicConfigProvider, $provide, $compileProvider, /*$ionicNativeTransitionsProvider,*/ $logProvider, $translateProvider, $injector) {
 
     //$logProvider.debugEnabled(false);
     //$compileProvider.debugInfoEnabled(false);
@@ -2294,9 +2304,10 @@ angular.module('zmApp', [
     // a) https://www.exratione.com/2013/08/angularjs-wrapping-http-for-fun-and-profit/
     // b) https://gist.github.com/adamreisnz/354364e2a58786e2be71
 
-    $provide.decorator('$http', ['$delegate', '$q', function ($delegate, $q) {
+    $provide.decorator('$http', ['$delegate', '$q', '$injector', function ($delegate, $q, $injector) {
       // create function which overrides $http function
       var $http = $delegate;
+      var logger = $injector.get("$rootScope");
 
       var wrapper = function () {
         var url;
@@ -2346,7 +2357,7 @@ angular.module('zmApp', [
               }
             },
             function (err) {
-              console.log("***  Inside native HTTP error: " + JSON.stringify(err));
+              logger.debug("***  Inside native HTTP error: " + JSON.stringify(err));
 
               d.reject(err);
               return d.promise;