https://youtu.be/9MVziVfYz2w?t=12. I did rm -rf dist ** npm run dist-all instead of rm -rf dist && npm run dist-all

55 files changed, 26 insertions, 23 deletions

diff --git a/config.xml b/config.xml
index 7e88b362..f18fa5fb 100644
--- a/config.xml
+++ b/config.xml
@@ -133,7 +133,6 @@
     </platform>
     <icon src="resources/android/icon/drawable-xhdpi-icon.png" />
     <preference name="SplashShowOnlyFirstTime" value="false" />
-    <plugin name="cordova-plugin-add-swift-support" spec="^1.7.2" />
     <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">
@@ -173,13 +172,14 @@
     <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-photo-library" spec="https://github.com/nilebma/cordova-plugin-photo-library.git">
+    <plugin name="cordova-plugin-media-pp-fork" spec="^1.0.2-dev" />
+    <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>
+    <engine name="ios" spec="4.5.5" />
+    <engine name="android" spec="8.0.0" />
     <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="ios" spec="4.5.5" />
-    <engine name="android" spec="8.0.0" />
 </widget>
diff --git a/make_desktop.sh b/make_desktop.sh
index b2b12bb0..80e1f3ff 100755
--- a/make_desktop.sh
+++ b/make_desktop.sh
@@ -107,6 +107,7 @@ do
                 exe cp electron_js/main.js $i/app/electron_js
                 exe cp www/ZMNINJA-LICENSE-DESKTOP-CLIENT.txt $BASENAME
                 echo $APPVER > $BASENAME/version
+                echo "APP VER IS $APPVER"
                 exe cp resources/icon.png $BASENAME
                 exe cd $i 
                 cat app/www/js/NVR.js | sed "s/var zmAppVersion[ ]*=[ ]*\"unknown\"/var zmAppVersion=\"$APPVER\"/" > app/www/js/NVR.js.tmp
diff --git a/package.json b/package.json
index a67229ec..f73b90e4 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "zmninjapro",
   "description": "Home security mobile app for ZoneMinder",
-  "version": "1.3.076",
+  "version": "1.3.078",
   "displayName": "zmNinja",
   "author": "Pliable Pixels",
   "license": "custom see LICENSE.md",
@@ -11,7 +11,6 @@
       "android"
     ],
     "plugins": {
-      "cordova-plugin-add-swift-support": {},
       "cordova-plugin-android-permissions": {},
       "cordova-plugin-app-version": {},
       "cordova-plugin-customurlscheme": {
@@ -42,7 +41,9 @@
         "ANDROID_BACKUP_SERVICE_KEY": "AEdPqrEAAAAIqF-OaHdwIzZhx2L1WOfAGTagBxm5a1R4wBW_Uw"
       },
       "cordova-plugin-ionic-keyboard": {},
-      "cordova-plugin-advanced-http": {},
+      "cordova-plugin-advanced-http": {
+        "OKHTTP_VERSION": "3.10.0"
+      },
       "cordova-plugin-x-socialsharing": {
         "ANDROID_SUPPORT_V4_VERSION": "24.1.1+"
       },
@@ -52,14 +53,15 @@
       },
       "cordova-custom-config": {},
       "cordova-plugin-advanced-websocket": {},
+      "cordova-plugin-splashscreen": {},
+      "cordova-plugin-media-pp-fork": {},
+      "cordova-plugin-add-swift-support": {},
       "cordova-plugin-photo-library": {
-        "PHOTO_LIBRARY_USAGE_DESCRIPTION": "Save monitor photos to albums "
+        "PHOTO_LIBRARY_USAGE_DESCRIPTION": " "
       },
-      "cordova-plugin-splashscreen": {},
       "cordova-plugin-ionic-webview": {
         "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+"
-      },
-      "cordova-plugin-media-pp-fork": {}
+      }
     }
   },
   "dependencies": {
@@ -68,7 +70,7 @@
     "cordova-custom-config": "^5.1.0",
     "cordova-ios": "4.5.5",
     "cordova-library-helper-pp-fork": "^1.0.1",
-    "cordova-plugin-add-swift-support": "^1.7.2",
+    "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",
@@ -76,8 +78,8 @@
     "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.2",
-    "cordova-plugin-file": "^6.0.1",
+    "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",
@@ -87,14 +89,14 @@
     "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",
-    "cordova-plugin-network-information": "^2.0.1",
-    "cordova-plugin-photo-library": "git+https://github.com/nilebma/cordova-plugin-photo-library.git",
+    "cordova-plugin-network-information": "^2.0.2",
+    "cordova-plugin-photo-library": "git+https://github.com/pliablepixels/cordova-plugin-photo-library.git",
     "cordova-plugin-pin-dialog": "^0.1.3",
     "cordova-plugin-splashscreen": "git+https://github.com/prageeth/cordova-plugin-splashscreen.git",
-    "cordova-plugin-statusbar": "^2.4.2",
+    "cordova-plugin-statusbar": "^2.4.3",
     "cordova-plugin-touch-id": "^3.4.0",
-    "cordova-plugin-whitelist": "^1.3.3",
-    "cordova-plugin-x-socialsharing": "^5.4.4",
+    "cordova-plugin-whitelist": "^1.3.4",
+    "cordova-plugin-x-socialsharing": "^5.4.7",
     "cordova-sqlite-storage": "^1.5.3",
     "cordova-support-google-services": "^1.1.0",
     "deep-equal": "^1.0.1",
diff --git a/prepare_desktop.sh b/prepare_desktop.sh
index 7abd9277..cc6e550d 100755
--- a/prepare_desktop.sh
+++ b/prepare_desktop.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-REL="v4.0.0"
+#REL="v4.0.0"
 # If compiling on rPI make use 3.0.16
-#REL="v3.0.16"
+REL="v3.1.3"
 WGET='wget'
 WGET_ARGS='-q --show-progress'
 UNZIP='unzip'
diff --git a/resources/android/icon/drawable-hdpi-icon.png b/resources/android/icon/drawable-hdpi-icon.png
index 70e1de37..bc34de04 100644
--- a/resources/android/icon/drawable-hdpi-icon.png
+++ b/resources/android/icon/drawable-hdpi-icon.png
diff --git a/resources/android/icon/drawable-ldpi-icon.png b/resources/android/icon/drawable-ldpi-icon.png
index cca94ee1..8503e20a 100644
--- a/resources/android/icon/drawable-ldpi-icon.png
+++ b/resources/android/icon/drawable-ldpi-icon.png
diff --git a/resources/android/icon/drawable-mdpi-icon.png b/resources/android/icon/drawable-mdpi-icon.png
index 86a22aa5..caa7eb35 100644
--- a/resources/android/icon/drawable-mdpi-icon.png
+++ b/resources/android/icon/drawable-mdpi-icon.png
diff --git a/resources/android/icon/drawable-xhdpi-icon.png b/resources/android/icon/drawable-xhdpi-icon.png
index aef732ed..2baf9d3e 100644
--- a/resources/android/icon/drawable-xhdpi-icon.png
+++ b/resources/android/icon/drawable-xhdpi-icon.png
diff --git a/resources/android/icon/drawable-xxhdpi-icon.png b/resources/android/icon/drawable-xxhdpi-icon.png
index eaef24ee..f41b44df 100644
--- a/resources/android/icon/drawable-xxhdpi-icon.png
+++ b/resources/android/icon/drawable-xxhdpi-icon.png
diff --git a/resources/android/icon/drawable-xxxhdpi-icon.png b/resources/android/icon/drawable-xxxhdpi-icon.png
index 8e38897e..13f4aee1 100644
--- a/resources/android/icon/drawable-xxxhdpi-icon.png
+++ b/resources/android/icon/drawable-xxxhdpi-icon.png
diff --git a/resources/android/splash/drawable-land-hdpi-screen.png b/resources/android/splash/drawable-land-hdpi-screen.png
index d7abdcb6..058f23ee 100644
--- a/resources/android/splash/drawable-land-hdpi-screen.png
+++ b/resources/android/splash/drawable-land-hdpi-screen.png
diff --git a/resources/android/splash/drawable-land-ldpi-screen.png b/resources/android/splash/drawable-land-ldpi-screen.png
index e36f21d7..97156662 100644
--- a/resources/android/splash/drawable-land-ldpi-screen.png
+++ b/resources/android/splash/drawable-land-ldpi-screen.png
diff --git a/resources/android/splash/drawable-land-mdpi-screen.png b/resources/android/splash/drawable-land-mdpi-screen.png
index 723e37a0..88346233 100644
--- a/resources/android/splash/drawable-land-mdpi-screen.png
+++ b/resources/android/splash/drawable-land-mdpi-screen.png
diff --git a/resources/android/splash/drawable-land-xhdpi-screen.png b/resources/android/splash/drawable-land-xhdpi-screen.png
index e657ecaa..e5de99ff 100644
--- a/resources/android/splash/drawable-land-xhdpi-screen.png
+++ b/resources/android/splash/drawable-land-xhdpi-screen.png
diff --git a/resources/android/splash/drawable-land-xxhdpi-screen.png b/resources/android/splash/drawable-land-xxhdpi-screen.png
index 6ed767e4..72a2c870 100644
--- a/resources/android/splash/drawable-land-xxhdpi-screen.png
+++ b/resources/android/splash/drawable-land-xxhdpi-screen.png
diff --git a/resources/android/splash/drawable-land-xxxhdpi-screen.png b/resources/android/splash/drawable-land-xxxhdpi-screen.png
index 92044db2..aac9b067 100644
--- a/resources/android/splash/drawable-land-xxxhdpi-screen.png
+++ b/resources/android/splash/drawable-land-xxxhdpi-screen.png
diff --git a/resources/android/splash/drawable-port-hdpi-screen.png b/resources/android/splash/drawable-port-hdpi-screen.png
index a4ce3644..ea652835 100644
--- a/resources/android/splash/drawable-port-hdpi-screen.png
+++ b/resources/android/splash/drawable-port-hdpi-screen.png
diff --git a/resources/android/splash/drawable-port-ldpi-screen.png b/resources/android/splash/drawable-port-ldpi-screen.png
index 5721aa5f..5dce2cbf 100644
--- a/resources/android/splash/drawable-port-ldpi-screen.png
+++ b/resources/android/splash/drawable-port-ldpi-screen.png
diff --git a/resources/android/splash/drawable-port-mdpi-screen.png b/resources/android/splash/drawable-port-mdpi-screen.png
index 1233eed1..9362bd78 100644
--- a/resources/android/splash/drawable-port-mdpi-screen.png
+++ b/resources/android/splash/drawable-port-mdpi-screen.png
diff --git a/resources/android/splash/drawable-port-xhdpi-screen.png b/resources/android/splash/drawable-port-xhdpi-screen.png
index 0c5291a2..574e15f1 100644
--- a/resources/android/splash/drawable-port-xhdpi-screen.png
+++ b/resources/android/splash/drawable-port-xhdpi-screen.png
diff --git a/resources/android/splash/drawable-port-xxhdpi-screen.png b/resources/android/splash/drawable-port-xxhdpi-screen.png
index 65084e07..87e565d2 100644
--- a/resources/android/splash/drawable-port-xxhdpi-screen.png
+++ b/resources/android/splash/drawable-port-xxhdpi-screen.png
diff --git a/resources/android/splash/drawable-port-xxxhdpi-screen.png b/resources/android/splash/drawable-port-xxxhdpi-screen.png
index c52441b9..17fbf11f 100644
--- a/resources/android/splash/drawable-port-xxxhdpi-screen.png
+++ b/resources/android/splash/drawable-port-xxxhdpi-screen.png
diff --git a/resources/ios/icon/icon-1024.png b/resources/ios/icon/icon-1024.png
index 81d65cbc..ac9c40bd 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 1dc813d4..48dbac42 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 09da6d1b..c693e052 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 8f655e97..3b239f29 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 63efff83..a5223f19 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 42339548..3c3711e7 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 5497b190..9508abb3 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 6b50264a..931218ca 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 a5026c37..093a15ac 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 86cbedce..e85815d0 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 7620493e..9a924ac4 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 b77b4e74..6839b447 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 c995cb4f..3591840e 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 e2d09ab0..85ddc4f6 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 0b0c095a..995240c6 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 2872ca7d..94f707f8 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 13985549..2515313f 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 39162d86..d7fe6ed8 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 b0442fb1..1ba03a66 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 9495e073..ce05fea7 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 208d0d0d..fdc77c8b 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 421c0935..94c20a11 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 a55947ab..432df0f0 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 3c92b910..66fb291b 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 f0bf2cdc..617d89af 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 a262edbf..08cbe4f5 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 9da6cad8..1ccb59ba 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 d67749d5..a89e035e 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 c473c458..f14523b7 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 eb00b061..4a416180 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 7349ebf1..e3c3a88a 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 70aa7c7e..1c8331a6 100644
--- a/resources/ios/splash/Default~iphone.png
+++ b/resources/ios/splash/Default~iphone.png
diff --git a/www/js/NVR.js b/www/js/NVR.js
index 07774b83..b8b3f57b 100644
--- a/www/js/NVR.js
+++ b/www/js/NVR.js
@@ -21,7 +21,7 @@ angular.module('zmApp.controllers')
         DO NOT TOUCH zmAppVersion
         It is changed by sync_version.sh
       */
-      var zmAppVersion = "1.3.076";
+      var zmAppVersion = "1.3.078";
       var isBackground = false;
       var justResumed = false;
       var timeSinceResumed = -1;