From c9b313579670eafe69cb7d9327bd56359eacbcb1 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Mon, 21 May 2018 10:13:24 -0700
Subject: various nits

---
 config.xml            | 11 ++++++-----
 package.json          |  6 +++---
 www/js/MontageCtrl.js |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/config.xml b/config.xml
index 7f41090d..36bdda7d 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.3.0" 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.3.000" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>zmNinja</name>
     <description>
 	High performance ZoneMinder client
@@ -12,6 +12,7 @@
     <access allows-arbitrary-loads-for-media="true" allows-arbitrary-loads-in-web-content="true" allows-local-networking="true" origin="*" />
     <allow-intent href="mailto:*" />
     <allow-navigation href="*" />
+    <preference name="xwalkMultipleApk" value="true" />
     <preference name="AndroidPersistentFileLocation" value="Compatibility" />
     <preference name="iosPersistentFileLocation" value="Library" />
     <preference name="AllowInlineMediaPlayback" value="true" />
@@ -29,7 +30,7 @@
     <preference name="SplashMaintainAspectRatio" value="true" />
     <preference name="FadeSplashScreen" value="false" />
     <preference name="BackgroundColor" value="#444444" />
-    <preference name="android-targetSdkVersion" value="23" />
+    <preference name="android-targetSdkVersion" value="26" />
     <preference name="SplashScreenBackgroundColor" value="#ababab" />
     <feature name="StatusBar">
         <param name="ios-package" onload="true" value="CDVStatusBar" />
@@ -103,6 +104,8 @@
     </platform>
     <icon src="resources/android/icon/drawable-xhdpi-icon.png" />
     <preference name="SplashShowOnlyFirstTime" value="false" />
+    <engine name="ios" spec="^4.5.4" />
+    <engine name="android" spec="^6.3.0" />
     <plugin name="com.telerik.plugins.nativepagetransitions" spec="^0.6.5" />
     <plugin name="cordova-plugin-android-permissions" spec="^1.0.0" />
     <plugin name="cordova-plugin-app-version" spec="^0.1.9" />
@@ -131,7 +134,6 @@
     </plugin>
     <plugin name="phonegap-plugin-mobile-accessibility" spec="^1.0.5" />
     <plugin name="cordova-custom-config" spec="~4.0.2" />
-    <plugin name="cordova.plugins.diagnostic" spec="^3.7.1" />
     <plugin name="cordova-plugin-email" spec="git+https://github.com/pliablepixels/cordova-email-plugin.git" />
     <plugin name="cordova-plugin-touch-id" spec="^3.2.0" />
     <plugin name="cordova-plugin-android-fingerprint-auth" spec="^1.4.0" />
@@ -145,7 +147,6 @@
     <plugin name="cordova-plugin-add-swift-support" spec="^1.7.1" />
     <plugin name="ionic-plugin-keyboard" spec="^2.2.1" />
     <plugin name="cordova-library-helper" spec="git+https://github.com/FlyingDonkeyDev/cordova-library-helper.git" />
+    <plugin name="cordova.plugins.diagnostic" spec="^3.7.1" />
     <plugin name="cordova-plugin-certificates" spec="git+https://github.com/hypery2k/cordova-certificate-plugin.git" />
-    <engine name="ios" spec="^4.5.4" />
-    <engine name="android" spec="6.4.0" />
 </widget>
diff --git a/package.json b/package.json
index d7590fe0..8b1cfc7d 100644
--- a/package.json
+++ b/package.json
@@ -49,8 +49,8 @@
       "cordova-plugin-add-swift-support": {},
       "ionic-plugin-keyboard": {},
       "cordova-library-helper": {},
-      "cordova-plugin-certificates": {},
-      "cordova.plugins.diagnostic": {}
+      "cordova.plugins.diagnostic": {},
+      "cordova-plugin-certificates": {}
     }
   },
   "dependencies": {
@@ -59,7 +59,7 @@
     "clivas": "^0.2.0",
     "com.telerik.plugins.nativepagetransitions": "^0.6.5",
     "cordova": "^8.0.0",
-    "cordova-android": "6.4.0",
+    "cordova-android": "^6.3.0",
     "cordova-custom-config": "~4.0.2",
     "cordova-ios": "^4.5.4",
     "cordova-library-helper": "git+https://github.com/FlyingDonkeyDev/cordova-library-helper.git",
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js
index 839c8527..de2bf8ac 100644
--- a/www/js/MontageCtrl.js
+++ b/www/js/MontageCtrl.js
@@ -1733,7 +1733,7 @@ angular.module('zmApp.controllers')
       //"&rand="+$scope.randToAvoidCacheMem +
 
 
-      // console.log("STREAM=" + stream);
+      //console.log("STREAM=" + stream);
       return stream;
 
     };
-- 
cgit v1.2.3