ZoneMinder#914 first phase of changes

Simpler1 · Mar 30, 2020 · c919ac2 · c919ac2
1 parent 550f33c
commit c919ac2
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 39 deletions.
diff --git 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.zmninja_pro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.3.091" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninja_pro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.3.094" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>zmNinja</name>
     <description>
 	High performance ZoneMinder client
@@ -41,6 +41,7 @@
         <param name="ios-package" onload="true" value="CDVStatusBar" />
     </feature>
     <platform name="ios">
+        <preference name="WKWebViewOnly" value="true" />
         <feature name="CDVWKWebViewEngine">
             <param name="ios-package" value="CDVWKWebViewEngine" />
         </feature>
@@ -132,8 +133,6 @@
     </platform>
     <icon src="resources/android/icon/drawable-xhdpi-icon.png" />
     <preference name="SplashShowOnlyFirstTime" value="false" />
-    <plugin name="cordova-plugin-android-permissions" spec="^1.0.0" />
-    <plugin name="cordova-plugin-app-version" spec="^0.1.9" />
     <plugin name="cordova-plugin-customurlscheme" spec="^4.3.0">
         <variable name="URL_SCHEME" value="zmninja" />
         <variable name="ANDROID_SCHEME" value=" " />
@@ -147,7 +146,6 @@
     <plugin name="cordova-plugin-splashscreen" spec="^4.1.0" />
     <plugin name="cordova-plugin-whitelist" spec="^1.3.3" />
     <plugin name="cordova-sqlite-storage" spec="^1.5.3" />
-    <plugin name="cordova-plugin-touch-id" spec="^3.4.0" />
     <plugin name="cordova-plugin-android-fingerprint-auth" spec="^1.5.0" />
     <plugin name="cordova-plugin-network-information" spec="^2.0.1" />
     <plugin name="cordova-plugin-device" spec="^2.0.2" />
@@ -159,27 +157,36 @@
     <plugin name="cordova-plugin-cloud-settings" spec="^1.0.4">
         <variable name="ANDROID_BACKUP_SERVICE_KEY" value="AEdPqrEAAAAIqF-OaHdwIzZhx2L1WOfAGTagBxm5a1R4wBW_Uw" />
     </plugin>
-    <plugin name="cordova-plugin-ionic-keyboard" spec="^2.1.3" />
-    <plugin name="cordova-plugin-x-socialsharing" spec="^5.4.3">
-        <variable name="ANDROID_SUPPORT_V4_VERSION" value="24.1.1+" />
-    </plugin>
     <plugin name="cordova-custom-config" spec="5.0.2" />
-    <plugin name="cordova-plugin-advanced-http" spec="git+https://github.com/silkimen/cordova-plugin-advanced-http.git" />
     <plugin name="cordova-plugin-advanced-websocket" spec="1.1.5" />
     <plugin name="cordova-plugin-add-swift-support" spec="1.7.2" />
     <plugin name="cordova-plugin-photo-library" spec="https://github.com/pliablepixels/cordova-plugin-photo-library">
         <variable name="PHOTO_LIBRARY_USAGE_DESCRIPTION" value=" " />
     </plugin>
-    <plugin name="cordova-plugin-inappbrowser" spec="3.2.0" />
     <plugin name="cordova-support-google-services" spec="1.3.2" />
     <plugin name="phonegap-plugin-push" spec="2.3.0">
         <variable name="ANDROID_SUPPORT_V13_VERSION" value="27.+" />
         <variable name="FCM_VERSION" value="17.0.+" />
     </plugin>
-    <plugin name="cordova-plugin-media-pp-fork" spec="^1.0.2-dev" />
-    <engine name="android" spec="8.0.0" />
-    <engine name="ios" spec="^5.0.1" />
+    <plugin name="cordova-plugin-advanced-http" spec="git+https://github.com/silkimen/cordova-plugin-advanced-http.git">
+        <variable name="OKHTTP_VERSION" value="3.10.0" />
+    </plugin>
+    <plugin name="cordova-plugin-x-socialsharing" spec="5.6.4">
+        <variable name="ANDROID_SUPPORT_V4_VERSION" value="24.1.1+" />
+        <variable name="PHOTO_LIBRARY_ADD_USAGE_DESCRIPTION" value="This app requires photo library access to function properly." />
+        <variable name="PHOTO_LIBRARY_USAGE_DESCRIPTION" value="This app requires photo library access to function properly." />
+    </plugin>
+    <plugin name="cordova-plugin-ionic-keyboard" spec="2.2.0" />
+    <plugin name="cordova-plugin-touch-id" spec="3.4.0">
+        <variable name="FACEID_USAGE_DESCRIPTION" value="" />
+    </plugin>
+    <plugin name="cordova-plugin-android-permissions" spec="1.0.2" />
+    <plugin name="cordova-plugin-app-version" spec="0.1.9" />
+    <plugin name="cordova-plugin-inappbrowser" spec="https://github.com/apache/cordova-plugin-inappbrowser.git" />
     <plugin name="cordova-plugin-ionic-webview" spec="https://github.com/pliablepixels/cordova-plugin-ionic-webview.git">
         <variable name="ANDROID_SUPPORT_ANNOTATIONS_VERSION" value="27.+" />
     </plugin>
+    <plugin name="cordova-plugin-media-pp-fork" spec="^1.0.2-dev" />
+    <engine name="android" spec="8.0.0" />
+    <engine name="ios" spec="5.1.1" />
 </widget>
diff --git a/make_dist.sh b/make_dist.sh
@@ -1,2 +1,8 @@
+#!/bin/bash
+DISTROS="dist-all"
 rm -fr dist/
-npm run dist-all
+echo $1
+if [ ! -z "$1" ]; then
+  DISTROS=$1
+fi
+npm run dist-${DISTROS}
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "zmninjapro",
   "description": "Home security mobile app for ZoneMinder",
-  "version": "1.3.091",
+  "version": "1.3.093",
   "displayName": "zmNinja",
   "author": "Pliable Pixels",
   "license": "custom see LICENSE.md",
@@ -11,8 +11,6 @@
       "ios"
     ],
     "plugins": {
-      "cordova-plugin-android-permissions": {},
-      "cordova-plugin-app-version": {},
       "cordova-plugin-customurlscheme": {
         "URL_SCHEME": "zmninja",
         "ANDROID_SCHEME": " ",
@@ -25,9 +23,6 @@
       "cordova-plugin-pin-dialog": {},
       "cordova-plugin-whitelist": {},
       "cordova-sqlite-storage": {},
-      "cordova-plugin-touch-id": {
-        "FACEID_USAGE_DESCRIPTION": " "
-      },
       "cordova-plugin-android-fingerprint-auth": {},
       "cordova-plugin-network-information": {},
       "cordova-plugin-device": {},
@@ -39,26 +34,33 @@
       "cordova-plugin-cloud-settings": {
         "ANDROID_BACKUP_SERVICE_KEY": "AEdPqrEAAAAIqF-OaHdwIzZhx2L1WOfAGTagBxm5a1R4wBW_Uw"
       },
-      "cordova-plugin-ionic-keyboard": {},
-      "cordova-plugin-advanced-http": {
-        "OKHTTP_VERSION": "3.10.0"
-      },
-      "cordova-plugin-x-socialsharing": {
-        "ANDROID_SUPPORT_V4_VERSION": "24.1.1+"
-      },
       "cordova-custom-config": {},
       "cordova-plugin-advanced-websocket": {},
       "cordova-plugin-splashscreen": {},
       "cordova-plugin-add-swift-support": {},
       "cordova-plugin-photo-library": {
         "PHOTO_LIBRARY_USAGE_DESCRIPTION": "Save monitor photos to albums"
       },
-      "cordova-plugin-inappbrowser": {},
       "cordova-support-google-services": {},
       "phonegap-plugin-push": {
         "ANDROID_SUPPORT_V13_VERSION": "27.+",
         "FCM_VERSION": "17.0.+"
       },
+      "cordova-plugin-advanced-http": {
+        "OKHTTP_VERSION": "3.10.0"
+      },
+      "cordova-plugin-x-socialsharing": {
+        "ANDROID_SUPPORT_V4_VERSION": "24.1.1+",
+        "PHOTO_LIBRARY_ADD_USAGE_DESCRIPTION": "This app requires photo library access to function properly.",
+        "PHOTO_LIBRARY_USAGE_DESCRIPTION": "This app requires photo library access to function properly."
+      },
+      "cordova-plugin-ionic-keyboard": {},
+      "cordova-plugin-touch-id": {
+        "FACEID_USAGE_DESCRIPTION": ""
+      },
+      "cordova-plugin-android-permissions": {},
+      "cordova-plugin-inappbrowser": {},
+      "cordova-plugin-app-version": {},
       "cordova-plugin-ionic-webview": {
         "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+"
       },
@@ -69,24 +71,24 @@
     "clivas": "^0.2.0",
     "cordova-android": "8.0.0",
     "cordova-custom-config": "^5.1.0",
-    "cordova-ios": "^5.0.1",
+    "cordova-ios": "5.1.1",
     "cordova-library-helper-pp-fork": "^1.0.1",
     "cordova-plugin-add-swift-support": "1.7.2",
     "cordova-plugin-advanced-http": "git+https://github.com/silkimen/cordova-plugin-advanced-http.git",
     "cordova-plugin-advanced-websocket": "^1.1.5",
     "cordova-plugin-android-fingerprint-auth": "^1.5.0",
-    "cordova-plugin-android-permissions": "^1.0.0",
-    "cordova-plugin-app-version": "^0.1.9",
+    "cordova-plugin-android-permissions": "1.0.2",
+    "cordova-plugin-app-version": "0.1.9",
     "cordova-plugin-cloud-settings": "^1.0.4",
     "cordova-plugin-customurlscheme": "^4.4.0",
     "cordova-plugin-device": "^2.0.3",
     "cordova-plugin-file": "6.0.2",
     "cordova-plugin-file-transfer": "^1.7.1",
     "cordova-plugin-globalization": "^1.11.0",
     "cordova-plugin-ignore-lint-translation": "0.0.1",
-    "cordova-plugin-inappbrowser": "3.2.0",
+    "cordova-plugin-inappbrowser": "git+https://github.com/apache/cordova-plugin-inappbrowser.git",
     "cordova-plugin-insomnia": "^4.3.0",
-    "cordova-plugin-ionic-keyboard": "^2.1.3",
+    "cordova-plugin-ionic-keyboard": "2.2.0",
     "cordova-plugin-ionic-webview": "git+https://github.com/pliablepixels/cordova-plugin-ionic-webview.git",
     "cordova-plugin-media-pp-fork": "^1.0.2-dev",
     "cordova-plugin-multi-window": "0.0.3",
@@ -95,9 +97,9 @@
     "cordova-plugin-pin-dialog": "^0.1.3",
     "cordova-plugin-splashscreen": "git+https://github.com/prageeth/cordova-plugin-splashscreen.git",
     "cordova-plugin-statusbar": "^2.4.3",
-    "cordova-plugin-touch-id": "^3.4.0",
+    "cordova-plugin-touch-id": "3.4.0",
     "cordova-plugin-whitelist": "^1.3.4",
-    "cordova-plugin-x-socialsharing": "^5.4.7",
+    "cordova-plugin-x-socialsharing": "5.6.4",
     "cordova-sqlite-storage": "^1.5.3",
     "cordova-support-google-services": "1.3.2",
     "deep-equal": "^1.0.1",
@@ -106,7 +108,7 @@
     "electron-osx-sign": "^0.4.15",
     "electron-window-state": "^4.1.1",
     "es-abstract": "^1.17.0",
-    "es6-promise-plugin": "^4.2.2",
+    "es6-promise-plugin": "4.2.2",
     "function-bind": "^1.1.1",
     "has": "^1.0.3",
     "has-symbols": "^1.0.1",

diff --git a/www/index.html b/www/index.html
@@ -84,6 +84,7 @@
   <script src="external/js/holder.min.js"></script>
   <script src="external/js/angular-cookies.min.js"></script>
   <script src="external/js/lz-string.min.js"></script>
+
 
   <!-- app related JS -->
   <script src="js/app.js"></script>
@@ -148,7 +149,7 @@
 
 
     window.ionic.Platform.ready(function () {
-     // console.log("******* PLATFORM READY ****");
+     //console.log("******* PLATFORM READY ****");
       angular.bootstrap(document, ['zmApp']);
     });
 

diff --git a/www/js/app.js b/www/js/app.js
@@ -21,7 +21,7 @@ angular.module('zmApp', [
     'uk.ac.soton.ecs.videogular.plugins.cuepoints',
     'dcbImgFallback',
     'angular-websocket',
-    'ngCookies'
+    'ngCookies',
 
 
   ])
@@ -1832,7 +1832,7 @@ angular.module('zmApp', [
       }
 
       function continueRestOfInit() {
-
+        
         // use desktop state for mobile too as 
         // mobile now quits
         if ($rootScope.platformOS == 'desktop' || 1) {