#709 currently remove wkwebview before building android

4 files changed, 36 insertions, 22 deletions

diff --git a/build_android.sh b/build_android.sh
index d084d8c4..4deac966 100755
--- a/build_android.sh
+++ b/build_android.sh
@@ -13,8 +13,8 @@ if [ ! -f "$NINJAKEYSTORE" ]; then
         exit
 fi
 
+rm -f release_files 2>/dev/null
 mkdir release_files
-rm -f release_files/*
 
 # no arguments - build both
 # 1 == build crosswalk only
@@ -30,6 +30,11 @@ if [ "$1" = "2" ]; then
         echo "only building native view (5+)"
 fi
 
+echo "----------> Only building native. Not building crosswalk anymore due to compatibility issues <----------------------"
+BUILD_MODE="native"
+
+ionic cordova plugin remove cordova-plugin-ionic-webview 2>/dev/null
+
 ############ Crosswalk build ####################################
 if [ "$BUILD_MODE" = "xwalk" ] || [ "$BUILD_MODE" = "all" ]; then
 
@@ -76,24 +81,25 @@ if [ "$BUILD_MODE" = "native" ] || [ "$BUILD_MODE" = "all" ]; then
     echo "${ver}: Building Release mode for android 5+..."
     echo "--------------------------------------------"
     
-    echo "Removing android and re-adding..."
-    cordova platform remove android
-    cordova platform add android@6.3.0
+#    No longger needed as we are not supporting Xwalk
+#    echo "Removing android and re-adding..."
+#    cordova platform remove android
+#    cordova platform add android@6.4.0
 
    #clean up past build stuff
-    echo "Adding default browser..."
-    cordova plugin remove cordova-plugin-crosswalk-webview
+#    echo "Adding default browser..."
+#    cordova plugin remove cordova-plugin-crosswalk-webview
 
     # use the right plugin for SSL certificate mgmt
-    cordova plugin remove cordova-plugin-crosswalk-certificate-pp-fork
-    cordova plugin add cordova-plugin-certificates
+#    cordova plugin remove cordova-plugin-crosswalk-certificate-pp-fork
+#    cordova plugin add cordova-plugin-certificates
     cp "$NINJAKEYSTORE" platforms/android/
 
     # Make sure native builds are only deployed in devices >= Android 5
     cordova build android --release -- --minSdkVersion=21 --versionCode=${ver}
 
     # copy build to release folder and sign
-    cp platforms/android/build/outputs/apk/android-release-unsigned.apk release_files/
+    cp platforms/android/build/outputs/apk/release/android-release-unsigned.apk release_files/
     echo "Copied files to release_files"
 
     cd release_files/
diff --git a/build_ios.sh b/build_ios.sh
index 2474b985..11a9e996 100755
--- a/build_ios.sh
+++ b/build_ios.sh
@@ -1,6 +1,8 @@
 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"
 
+ionic cordova plugin add cordova-plugin-ionic-webview@latest
+
 echo "--- readding certificate plugin to make sure... ---"
 ionic cordova plugin remove cordova-plugin-certificates
 ionic cordova plugin add cordova-plugin-certificates
diff --git a/config.xml b/config.xml
index 020f5653..46e411c4 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.3.025" 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.zmninja_pro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.3.025" 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
@@ -8,10 +8,13 @@
 	Pliable Pixels
     </author>
     <content src="index.html" />
+    <allow-navigation href="localhost:8080/*" />
+    <allow-navigation href="gap://ready" />
     <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="http://localhost:8080/*" />
+    <allow-intent href="http://*/*" />
+    <allow-intent href="https://*/*" />
     <preference name="KeyboardResizeMode" value="native" />
     <preference name="xwalkMultipleApk" value="true" />
     <preference name="AndroidPersistentFileLocation" value="Compatibility" />
@@ -26,7 +29,7 @@
     <preference name="AutoHideSplashScreen" value="false" />
     <preference name="ShowSplashScreenSpinner" value="false" />
     <preference name="SplashScreen" value="screen" />
-    <preference name="deployment-target" value="8.0" />
+    <preference name="deployment-target" value="10.0" />
     <preference name="SplashScreenDelay" value="300" />
     <preference name="SplashMaintainAspectRatio" value="true" />
     <preference name="FadeSplashScreen" value="false" />
@@ -87,6 +90,9 @@
         <icon height="1024" src="resources/ios/icon/icon-1024.png" width="1024" />
     </platform>
     <platform name="android">
+        <config-file parent="/*" target="AndroidManifest.xml">
+            <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+        </config-file>
         <resource-file src="build-extras.gradle" target="build-extras.gradle" />
         <resource-file src="google-services.json" target="google-services.json" />
         <preference name="android-manifest/@android:installLocation" value="auto" />
@@ -123,9 +129,6 @@
     <plugin name="cordova-plugin-globalization" spec="^1.0.7" />
     <plugin name="cordova-plugin-inappbrowser" spec="^1.7.1" />
     <plugin name="cordova-plugin-insomnia" spec="^4.3.0" />
-    <plugin name="cordova-plugin-photo-library" spec="^1.2.2">
-        <variable name="PHOTO_LIBRARY_USAGE_DESCRIPTION" value="images to gallery" />
-    </plugin>
     <plugin name="cordova-plugin-pin-dialog" spec="^0.1.3" />
     <plugin name="cordova-plugin-settings-hook" spec="^0.2.7" />
     <plugin name="cordova-plugin-splashscreen" spec="^4.0.3" />
@@ -154,10 +157,13 @@
         <variable name="FCM_VERSION" value="11.6.2" />
     </plugin>
     <plugin name="cordova-plugin-ionic-keyboard" spec="^2.1.2" />
+    <plugin name="cordova-plugin-photo-library" spec="git+https://github.com/pliablepixels/cordova-plugin-photo-library.git">
+        <variable name="PHOTO_LIBRARY_USAGE_DESCRIPTION" value="Save image alarms todisk" />
+    </plugin>
     <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="ios" spec="~4.5.5" />
-    <engine name="android" spec="~6.4.0" />
+    <engine name="android" spec="^6.4.0" />
 </widget>
diff --git a/package.json b/package.json
index 49e0a048..54516d81 100644
--- a/package.json
+++ b/package.json
@@ -22,9 +22,6 @@
       "cordova-plugin-globalization": {},
       "cordova-plugin-inappbrowser": {},
       "cordova-plugin-insomnia": {},
-      "cordova-plugin-photo-library": {
-        "PHOTO_LIBRARY_USAGE_DESCRIPTION": "images to gallery"
-      },
       "cordova-plugin-pin-dialog": {},
       "cordova-plugin-settings-hook": {},
       "cordova-plugin-splashscreen": {},
@@ -53,6 +50,9 @@
         "FCM_VERSION": "11.6.2"
       },
       "cordova-plugin-ionic-keyboard": {},
+      "cordova-plugin-photo-library": {
+        "PHOTO_LIBRARY_USAGE_DESCRIPTION": "Save image alarms todisk"
+      },
       "cordova-plugin-ionic-webview": {
         "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+"
       },
@@ -62,6 +62,7 @@
   "dependencies": {
     "clivas": "^0.2.0",
     "com.telerik.plugins.nativepagetransitions": "^0.6.5",
+    "cordova-android": "^6.4.0",
     "cordova-ios": "~4.5.5",
     "cordova-library-helper-pp-fork": "^1.0.1",
     "cordova-plugin-add-swift-support": "^1.7.2",
@@ -85,7 +86,7 @@
     "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": "^1.2.2",
+    "cordova-plugin-photo-library": "git+https://github.com/pliablepixels/cordova-plugin-photo-library.git",
     "cordova-plugin-pin-dialog": "^0.1.3",
     "cordova-plugin-settings-hook": "^0.2.7",
     "cordova-plugin-splashscreen": "^4.0.3",
@@ -102,8 +103,7 @@
     "minimist": "^1.2.0",
     "mkdirp": "^0.5.1",
     "phonegap-plugin-mobile-accessibility": "^1.0.5",
-    "phonegap-plugin-push": "^2.1.3",
-    "cordova-android": "~6.4.0"
+    "phonegap-plugin-push": "^2.1.3"
   },
   "devDependencies": {
     "bower": "^1.8.4",