From 7c99098373ae5b84fb17ac89afbe09fdc28ecea3 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Thu, 25 Aug 2016 09:21:35 -0400
Subject: fixed app version plugin change

Former-commit-id: de8dc6fec144cf994824d5f0f8005d7fc8a4b994
---
 config.xml         |  2 +-
 plugins/fetch.json | 16 ++++++++--------
 www/js/app.js      |  7 +++++--
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/config.xml b/config.xml
index f01f5c9e..2600cdf0 100644
--- a/config.xml
+++ b/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninjapro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.2.14" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninjapro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.2.15" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>zmNinja</name>
     <description>
 	High performance ZoneMinder client
diff --git a/plugins/fetch.json b/plugins/fetch.json
index 63e81799..fcf02551 100644
--- a/plugins/fetch.json
+++ b/plugins/fetch.json
@@ -9,14 +9,6 @@
             "SENDER_ID": "710936220256"
         }
     },
-    "cordova-plugin-app-version": {
-        "source": {
-            "type": "registry",
-            "id": "cordova-plugin-app-version"
-        },
-        "is_top_level": true,
-        "variables": {}
-    },
     "cordova-plugin-file": {
         "source": {
             "type": "registry",
@@ -194,5 +186,13 @@
         },
         "is_top_level": true,
         "variables": {}
+    },
+    "cordova-plugin-app-version": {
+        "source": {
+            "type": "registry",
+            "id": "cordova-plugin-app-version"
+        },
+        "is_top_level": true,
+        "variables": {}
     }
 }
\ No newline at end of file
diff --git a/www/js/app.js b/www/js/app.js
index a43f710e..27a76a05 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -828,7 +828,10 @@ angular.module('zmApp', [
                         //eventServer.start();
                         $rootScope.loggedIntoZm = 1;
 
-                        ZMDataModel.zmLog("zmAutolog.runin successfully logged into Zoneminder");
+                        ZMDataModel.zmLog("zmAutologin successfully logged into Zoneminder");
+                        
+                        ZMDataModel.zmDebug (">>>>> I GOT THIS LOGIN DATA - ARE WE REALLY LOGGED IN ?");
+                        ZMDataModel.zmDebug (">>>>>"+ JSON.stringify(data));
 
                         d.resolve("Login Success");
 
@@ -1264,7 +1267,7 @@ angular.module('zmApp', [
                     ZMDataModel.zmLog("Enabling insecure SSL");
                     cordova.plugins.certificates.trustUnsecureCerts(true);
 
-                    cordova.getAppVersion(function (version) {
+                    cordova.getAppVersion.getVersionNumber().then(function (version) {
                         appVersion = version;
                         ZMDataModel.zmLog("App Version: " + appVersion);
                         ZMDataModel.setAppVersion(appVersion);
-- 
cgit v1.2.3