From a3bbc9b29d951252e79927d4d31ccb5c0c3ba43d Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Sat, 4 Jul 2020 17:26:25 -0400
Subject: change to SSLCertMode and update http plugin

---
 config.xml             | 11 +++++++----
 package.json           | 16 ++++++++++------
 www/js/FirstUseCtrl.js |  2 +-
 www/js/LoginCtrl.js    |  2 +-
 www/js/NVR.js          |  2 +-
 5 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/config.xml b/config.xml
index 51d0e6b2..ada481ec 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.zmninja_pro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.4.009" 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.4.010" 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
@@ -169,9 +169,6 @@
         <variable name="ANDROID_SUPPORT_V13_VERSION" value="27.+" />
         <variable name="FCM_VERSION" value="17.0.+" />
     </plugin>
-    <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." />
@@ -185,6 +182,12 @@
     <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-whitelist" spec="^1.3.4" />
+    <plugin name="cordova-plugin-advanced-http" spec="^2.5.1">
+        <variable name="OKHTTP_VERSION" value="3.10.0" />
+    </plugin>
+    <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="^4.5.5" />
diff --git a/package.json b/package.json
index 35e9fd3a..534b2731 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "zmninjapro",
   "description": "Home security mobile app for ZoneMinder",
-  "version":"1.4.009",
+  "version": "1.4.009",
   "displayName": "zmNinja",
   "author": "Pliable Pixels",
   "license": "custom see LICENSE.md",
@@ -45,9 +45,6 @@
         "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.",
@@ -62,6 +59,12 @@
       "cordova-plugin-app-version": {},
       "cordova-plugin-statusbar-pp-fork": {},
       "cordova-plugin-statusbar": {},
+      "cordova-plugin-advanced-http": {
+        "OKHTTP_VERSION": "3.10.0"
+      },
+      "cordova-plugin-ionic-webview": {
+        "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+"
+      },
       "cordova-plugin-media-pp-fork": {}
     }
   },
@@ -73,7 +76,7 @@
     "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": "git+https://github.com/silkimen/cordova-plugin-advanced-http.git",
+    "cordova-plugin-advanced-http": "^2.5.1",
     "cordova-plugin-advanced-websocket": "^1.1.5",
     "cordova-plugin-android-fingerprint-auth": "^1.5.0",
     "cordova-plugin-android-permissions": "^1.0.2",
@@ -88,6 +91,7 @@
     "cordova-plugin-inappbrowser": "git+https://github.com/apache/cordova-plugin-inappbrowser.git",
     "cordova-plugin-insomnia": "^4.3.0",
     "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",
     "cordova-plugin-network-information": "^2.0.2",
@@ -229,4 +233,4 @@
       ]
     }
   }
-}
+}
\ No newline at end of file
diff --git a/www/js/FirstUseCtrl.js b/www/js/FirstUseCtrl.js
index c6f55ef4..04146855 100644
--- a/www/js/FirstUseCtrl.js
+++ b/www/js/FirstUseCtrl.js
@@ -18,7 +18,7 @@ angular.module('zmApp.controllers').controller('zmApp.FirstUseCtrl', ['$scope',
 
     // 
     if (window.cordova) {
-      cordova.plugin.http.setSSLCertMode('nocheck', function () {
+      cordova.plugin.http.setServerTrustMode('nocheck', function () {
         NVR.debug('--> First use -> SSL is permissive, will allow any certs for now. You can change it later.');
       }, function () {
         NVR.log('-->First Use -> Error setting SSL permissive');
diff --git a/www/js/LoginCtrl.js b/www/js/LoginCtrl.js
index 4a083930..e64d7a6f 100644
--- a/www/js/LoginCtrl.js
+++ b/www/js/LoginCtrl.js
@@ -754,7 +754,7 @@ function mobilePinConfig () {
 
         //alert("Enabling insecure SSL");
         NVR.log(">>>> Disabling strict SSL checking (turn off  in Dev Options if you can't connect)");
-        cordova.plugin.http.setSSLCertMode('nocheck', function () {
+        cordova.plugin.http.setServerTrustMode('nocheck', function () {
           NVR.debug('--> SSL is permissive, will allow any certs. Use at your own risk.');
         }, function () {
           NVR.log('-->Error setting SSL permissive');
diff --git a/www/js/NVR.js b/www/js/NVR.js
index 80d3ddc4..65a18dbc 100644
--- a/www/js/NVR.js
+++ b/www/js/NVR.js
@@ -264,7 +264,7 @@ angular.module('zmApp.controllers')
 
           //alert("Enabling insecure SSL");
           log(">>>> Disabling strict SSL checking (turn off  in Dev Options if you can't connect)");
-          cordova.plugin.http.setSSLCertMode('nocheck', function () {
+          cordova.plugin.http.setServerTrustMode('nocheck', function () {
             debug('--> SSL is permissive, will allow any certs. Use at your own risk.');
           }, function () {
             NVR.log('-->Error setting SSL permissive');
-- 
cgit v1.2.3