nits

5 files changed, 7 insertions, 26 deletions

diff --git a/.DS_Store b/.DS_Store
index c62fee1c..73c34ed4 100644
--- a/.DS_Store
+++ b/.DS_Store
diff --git a/config.xml b/config.xml
index fc6b5b32..0a4383e7 100644
--- a/config.xml
+++ b/config.xml
@@ -114,16 +114,9 @@
     <plugin name="cordova-plugin-add-swift-support" spec="^1.7.0" />
     <plugin name="cordova-plugin-android-permissions" spec="^1.0.0" />
     <plugin name="cordova-plugin-app-version" spec="^0.1.9" />
+    <plugin name="cordova-plugin-certificates" spec="git+https://github.com/hypery2k/cordova-certificate-plugin.git" />
     <plugin name="cordova-plugin-compat" spec="^1.2.0" />
     <plugin name="cordova-plugin-console" spec="^1.1.0" />
-    <plugin name="cordova-plugin-crosswalk-certificate" spec="git+https://github.com/danjarvis/cordova-plugin-crosswalk-certificate.git" />
-    <plugin name="cordova-plugin-crosswalk-webview" spec="^2.2.0">
-        <variable name="XWALK_MODE" value="lite" />
-        <variable name="XWALK_VERSION" value="17.46.459.1" />
-        <variable name="XWALK_LITEVERSION" value="xwalk_core_library_canary:17+" />
-        <variable name="XWALK_COMMANDLINE" value="--disable-pull-to-refresh-effect" />
-        <variable name="XWALK_MULTIPLEAPK" value="true" />
-    </plugin>
     <plugin name="cordova-plugin-customurlscheme" spec="^4.3.0">
         <variable name="URL_SCHEME" value="zmninja" />
     </plugin>
diff --git a/package-lock.json b/package-lock.json
index 371e2a27..fba6ff28 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -687,6 +687,9 @@
         "cordova-plugin-canvas2image": {
             "version": "git+https://github.com/flache/Canvas2ImagePlugin.git#bbdace729672f8e0dd4ed69da04ab1b20daa463a"
         },
+        "cordova-plugin-certificates": {
+            "version": "git+https://github.com/hypery2k/cordova-certificate-plugin.git#762175849f553a4a98a47f6ab55438df8223647e"
+        },
         "cordova-plugin-compat": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/cordova-plugin-compat/-/cordova-plugin-compat-1.2.0.tgz",
@@ -697,14 +700,6 @@
             "resolved": "https://registry.npmjs.org/cordova-plugin-console/-/cordova-plugin-console-1.1.0.tgz",
             "integrity": "sha1-4vusECkBeeRMtyxf28QQpTHBzW0="
         },
-        "cordova-plugin-crosswalk-certificate": {
-            "version": "git+https://github.com/danjarvis/cordova-plugin-crosswalk-certificate.git#d94d92cdf7c4440d92614eb04332af6b0fb1de3e"
-        },
-        "cordova-plugin-crosswalk-webview": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/cordova-plugin-crosswalk-webview/-/cordova-plugin-crosswalk-webview-2.2.0.tgz",
-            "integrity": "sha1-tbd4HjqROwGABWV9NHzbcm/ZLlM="
-        },
         "cordova-plugin-customurlscheme": {
             "version": "4.3.0",
             "resolved": "https://registry.npmjs.org/cordova-plugin-customurlscheme/-/cordova-plugin-customurlscheme-4.3.0.tgz",
diff --git a/package.json b/package.json
index 039b816e..c1e390d2 100644
--- a/package.json
+++ b/package.json
@@ -53,14 +53,7 @@
             "cordova-custom-config": {},
             "cordova.plugins.diagnostic": {},
             "cordova-plugin-email": {},
-            "cordova-plugin-crosswalk-webview": {
-                "XWALK_MODE": "lite",
-                "XWALK_VERSION": "17.46.459.1",
-                "XWALK_LITEVERSION": "xwalk_core_library_canary:17+",
-                "XWALK_COMMANDLINE": "--disable-pull-to-refresh-effect",
-                "XWALK_MULTIPLEAPK": "true"
-            },
-            "cordova-plugin-crosswalk-certificate": {}
+            "cordova-plugin-certificates": {}
         }
     },
     "dependencies": {
@@ -74,10 +67,9 @@
         "cordova-plugin-android-permissions": "^1.0.0",
         "cordova-plugin-app-version": "^0.1.9",
         "cordova-plugin-canvas2image": "git+https://github.com/flache/Canvas2ImagePlugin.git",
+        "cordova-plugin-certificates": "git+https://github.com/hypery2k/cordova-certificate-plugin.git",
         "cordova-plugin-compat": "^1.2.0",
         "cordova-plugin-console": "^1.1.0",
-        "cordova-plugin-crosswalk-certificate": "git+https://github.com/danjarvis/cordova-plugin-crosswalk-certificate.git",
-        "cordova-plugin-crosswalk-webview": "^2.2.0",
         "cordova-plugin-customurlscheme": "^4.3.0",
         "cordova-plugin-device": "^1.1.6",
         "cordova-plugin-email": "git+https://github.com/pliablepixels/cordova-email-plugin.git",
diff --git a/www/js/app.js b/www/js/app.js
index 5d82d78c..1c6fe958 100755
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -1242,6 +1242,7 @@ angular.module('zmApp', [
 
        window.addEventListener('beforeunload', function (ev) {
 
+        // This was causing android reload issues - holy palooza
        /* if ($rootScope.platformOS != 'desktop') {
           ev.returnValue = "true";
           return;