From 2dcd736caf0cfd3fc4ff0a2841d486c795d6661d Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Sun, 23 Sep 2018 14:17:04 -0400
Subject: wekwebview fixes

---
 build_ios.sh          |  5 +++++
 config.xml            | 14 +++++++++++---
 jsconfig.json         | 15 +++++++++++----
 package.json          | 14 +++++++++-----
 www/js/MontageCtrl.js |  4 ++--
 www/js/app.js         |  8 ++++----
 6 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/build_ios.sh b/build_ios.sh
index 0e87eca7..2474b985 100755
--- a/build_ios.sh
+++ b/build_ios.sh
@@ -1,4 +1,9 @@
 echo "*** Using old build system due to XCode 10 issues ** "
 echo "see https://forum.ionicframework.com/t/how-to-build-ionic-cordova-with-xcode-10/142044"
 
+echo "--- readding certificate plugin to make sure... ---"
+ionic cordova plugin remove cordova-plugin-certificates
+ionic cordova plugin add cordova-plugin-certificates
+
+echo "-- building --"
 ionic cordova build ios --release --buildConfig="./build-auto.json"
diff --git a/config.xml b/config.xml
index 9866dea0..020f5653 100644
--- a/config.xml
+++ b/config.xml
@@ -11,7 +11,8 @@
     <access launch-external="yes" origin="mailto:*" />
     <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="*" />
+    <allow-navigation href="http://localhost:8080/*" />
+    <preference name="KeyboardResizeMode" value="native" />
     <preference name="xwalkMultipleApk" value="true" />
     <preference name="AndroidPersistentFileLocation" value="Compatibility" />
     <preference name="iosPersistentFileLocation" value="Library" />
@@ -36,6 +37,10 @@
         <param name="ios-package" onload="true" value="CDVStatusBar" />
     </feature>
     <platform name="ios">
+        <feature name="CDVWKWebViewEngine">
+            <param name="ios-package" value="CDVWKWebViewEngine" />
+        </feature>
+        <preference name="CordovaWebViewEngine" value="CDVWKWebViewEngine" />
         <resource-file src="GoogleService-Info.plist" />
         <config-file parent="NSPhotoLibraryAddUsageDescription" platform="ios" target="*-Info.plist">
             <string>Store photos of events and live feeds</string>
@@ -142,14 +147,17 @@
     <plugin name="cordova-library-helper-pp-fork" spec="^1.0.1" />
     <plugin name="cordova-plugin-multi-window" spec="0.0.3" />
     <plugin name="cordova-plugin-ignore-lint-translation" spec="0.0.1" />
-    <plugin name="cordova-plugin-ionic-keyboard" spec="^2.1.2" />
     <plugin name="cordova-plugin-cloud-settings" spec="^1.0.4">
         <variable name="ANDROID_BACKUP_SERVICE_KEY" value="AEdPqrEAAAAIqF-OaHdwIzZhx2L1WOfAGTagBxm5a1R4wBW_Uw" />
     </plugin>
     <plugin name="phonegap-plugin-push" spec="^2.1.3">
         <variable name="FCM_VERSION" value="11.6.2" />
     </plugin>
+    <plugin name="cordova-plugin-ionic-keyboard" spec="^2.1.2" />
+    <plugin name="cordova-plugin-ionic-webview" spec="^2.1.4">
+        <variable name="ANDROID_SUPPORT_ANNOTATIONS_VERSION" value="27.+" />
+    </plugin>
     <plugin name="cordova-plugin-certificates" spec="^0.6.4" />
-    <engine name="android" spec="^6.3.0" />
     <engine name="ios" spec="~4.5.5" />
+    <engine name="android" spec="~6.4.0" />
 </widget>
diff --git a/jsconfig.json b/jsconfig.json
index bccb75f0..fb1eda40 100644
--- a/jsconfig.json
+++ b/jsconfig.json
@@ -1,11 +1,18 @@
 {
+
+    
     "include": [
-        "www/**/*"
+        "www/js/**/*",
+        "www/css/**/*",
+        "www/templates/**/*"
        
     ],
     "exclude": [
-        "node_modules/**/*",
-        "dist/**/*",
-        "platforms/**/*"
+        "node_modules",
+        "**/node_modules/*",
+        "dist",
+        "platforms",
+        ".vscode",
+
     ]
 }
\ No newline at end of file
diff --git a/package.json b/package.json
index ecf8fb61..49e0a048 100644
--- a/package.json
+++ b/package.json
@@ -7,8 +7,8 @@
   "license": "custom see LICENSE.md",
   "cordova": {
     "platforms": [
-      "android",
-      "ios"
+      "ios",
+      "android"
     ],
     "plugins": {
       "cordova-plugin-add-swift-support": {},
@@ -46,20 +46,22 @@
       "cordova-library-helper-pp-fork": {},
       "cordova-plugin-multi-window": {},
       "cordova-plugin-ignore-lint-translation": {},
-      "cordova-plugin-ionic-keyboard": {},
       "cordova-plugin-cloud-settings": {
         "ANDROID_BACKUP_SERVICE_KEY": "AEdPqrEAAAAIqF-OaHdwIzZhx2L1WOfAGTagBxm5a1R4wBW_Uw"
       },
       "phonegap-plugin-push": {
         "FCM_VERSION": "11.6.2"
       },
+      "cordova-plugin-ionic-keyboard": {},
+      "cordova-plugin-ionic-webview": {
+        "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+"
+      },
       "cordova-plugin-certificates": {}
     }
   },
   "dependencies": {
     "clivas": "^0.2.0",
     "com.telerik.plugins.nativepagetransitions": "^0.6.5",
-    "cordova-android": "^6.3.0",
     "cordova-ios": "~4.5.5",
     "cordova-library-helper-pp-fork": "^1.0.1",
     "cordova-plugin-add-swift-support": "^1.7.2",
@@ -79,6 +81,7 @@
     "cordova-plugin-inappbrowser": "^1.7.1",
     "cordova-plugin-insomnia": "^4.3.0",
     "cordova-plugin-ionic-keyboard": "^2.1.2",
+    "cordova-plugin-ionic-webview": "^2.1.4",
     "cordova-plugin-media-pp-fork": "^1.0.2-dev",
     "cordova-plugin-multi-window": "0.0.3",
     "cordova-plugin-network-information": "^2.0.1",
@@ -99,7 +102,8 @@
     "minimist": "^1.2.0",
     "mkdirp": "^0.5.1",
     "phonegap-plugin-mobile-accessibility": "^1.0.5",
-    "phonegap-plugin-push": "^2.1.3"
+    "phonegap-plugin-push": "^2.1.3",
+    "cordova-android": "~6.4.0"
   },
   "devDependencies": {
     "bower": "^1.8.4",
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js
index fefe2ddc..f4c77a80 100644
--- a/www/js/MontageCtrl.js
+++ b/www/js/MontageCtrl.js
@@ -334,7 +334,7 @@ angular.module('zmApp.controllers')
 
         progressCalled = true;
         loadCount++;
-        console.log ("loaded "+loadCount+" of "+positions.length);
+       // console.log ("loaded "+loadCount+" of "+positions.length);
 
         // if (layouttype) $timeout (function(){layout(pckry);},100);
       });
@@ -1828,7 +1828,7 @@ angular.module('zmApp.controllers')
       // NVRDataModel.regenConnKeys();
       $scope.monitors = NVRDataModel.getMonitorsNow();
 
-      console.log ("MONITORS:"+JSON.stringify($scope.monitors));
+      //console.log ("MONITORS:"+JSON.stringify($scope.monitors));
 
       $scope.MontageMonitors = angular.copy($scope.monitors);
 
diff --git a/www/js/app.js b/www/js/app.js
index 6287e09b..6ca4c9d0 100755
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -1967,9 +1967,9 @@ angular.module('zmApp', [
         $rootScope.$state = $state;
         $rootScope.$stateParams = $stateParams;
 
-        if (window.cordova && window.cordova.plugins.Keyboard) {
-          // console.log("no keyboard");
-          // cordova.plugins.Keyboard.disableScroll(true);
+        if (window.cordova ) {
+          console.log("------------->Keyboard foonone");
+           //window.cordova.plugins.Keyboard.disableScroll(true);
         }
         if (window.StatusBar) {
           // org.apache.cordova.statusbar required
@@ -2255,7 +2255,7 @@ angular.module('zmApp', [
     }]);
 
     // If you do this, Allow Origin can't be *
-    //$httpProvider.defaults.withCredentials = true;
+    $httpProvider.defaults.withCredentials = true;
     $httpProvider.interceptors.push('timeoutHttpIntercept');
     $ionicConfigProvider.navBar.alignTitle('center');
     //$ionicConfigProvider.backButton.text('').icon('ion-chevron-left');
-- 
cgit v1.2.3