nits

3 files changed, 89 insertions, 7 deletions

diff --git a/config.xml b/config.xml
index 5e66e095..d2359e9b 100644
--- a/config.xml
+++ b/config.xml
@@ -45,6 +45,12 @@
         </feature>
         <preference name="CordovaWebViewEngine" value="CDVWKWebViewEngine" />
         <resource-file src="GoogleService-Info.plist" />
+        <config-file parent="NSAppTransportSecurity" target="*-Info.plist">
+            <dict>
+                <key>NSAllowsArbitraryLoads</key>
+                <true />
+            </dict>
+        </config-file>
         <config-file parent="NSPhotoLibraryAddUsageDescription" platform="ios" target="*-Info.plist">
             <string>Store photos of events and live feeds</string>
         </config-file>
@@ -157,13 +163,13 @@
     <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-advanced-http" spec="^2.0.1" />
     <plugin name="phonegap-plugin-push" spec="~2.1.3">
         <variable name="FCM_VERSION" value="11.6.2" />
     </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>
     <engine name="android" spec="^6.4.0" />
     <engine name="ios" spec="~4.5.5" />
 </widget>
diff --git a/package.json b/package.json
index 98803b58..487fc3de 100644
--- a/package.json
+++ b/package.json
@@ -50,12 +50,12 @@
       "cordova-plugin-photo-library": {
         "PHOTO_LIBRARY_USAGE_DESCRIPTION": "Save image alarms todisk"
       },
-      "cordova-plugin-ionic-webview": {
-        "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+"
-      },
       "cordova-plugin-advanced-http": {},
       "phonegap-plugin-push": {
         "FCM_VERSION": "11.6.2"
+      },
+      "cordova-plugin-ionic-webview": {
+        "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+"
       }
     }
   },
@@ -82,7 +82,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-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",
diff --git a/prepare_desktop.sh b/prepare_desktop.sh
new file mode 100755
index 00000000..86d28945
--- /dev/null
+++ b/prepare_desktop.sh
@@ -0,0 +1,76 @@
+#!/bin/bash
+
+REL="v2.0.3"
+#REL="v1.4.3"
+WGET='wget'
+WGET_ARGS='-q --show-progress'
+UNZIP='unzip'
+UNZIP_ARGS='-d'
+
+exe() { echo "\$ $@" ; "$@" ; }
+
+echo ----------------------------------------------------
+echo Pliable Pixels Desktop preparation process
+echo Use this to download electron images
+echo You really need to do this one time
+echo ----------------------------------------------------
+echo
+echo This will delete all files in desktop/ and also remove icon associations
+read -p "Press a key to continue or Ctrl-C to break..."
+
+
+iswget=`which ${WGET}`
+if [ $? -ne 0 ]; then
+    echo "**ERROR** You need ${WGET} installed in your path to use this tool."  
+    exit
+fi
+rm -rf desktop
+mkdir -p desktop 2>/dev/null
+cd desktop
+
+
+declare -a release_names=("darwin-x64" "win32-x64" "win32-ia32" "linux-arm" "linux-x64" "linux-ia32")
+declare -a release_renames=("zmNinja-mac.app" "zmNinja-win64bit" "zmNinja-win32bit" "zmNinja-linuxarm" "zmNinja-linux64bit" "zmNinja-linux32bit")
+
+for i in "${!release_names[@]}"
+do
+    RELEASE="https://github.com/electron/electron/releases/download/${REL}/electron-${REL}-${release_names[$i]}.zip"
+    echo
+    echo "Working on ${RELEASE}..."
+    #echo "Rename to ${release_renames[$i]}"
+    echo "---------------------------------------------"
+    
+    echo "Downloading ${release_names[i]}  ..."
+    exe ${WGET} ${RELEASE} ${WGET_ARGS}
+    
+
+    echo "Decompressing image..."
+    if [ "${release_names[$i]}" != "darwin-x64" ]; then
+        exe mkdir electron-${REL}-${release_names[$i]} >/dev/null 2>&1
+        exe rm -fr electron-${REL}-${release_names[$i]}/* >/dev/null 2>&1
+        exe ${UNZIP}  electron-${REL}-${release_names[$i]}.zip  ${UNZIP_ARGS} electron-${REL}-${release_names[$i]} 2>/dev/null 
+        exe mv electron-${REL}-${release_names[$i]} ${release_renames[$i]} >/dev/null 2>&1
+        mv ${release_renames[$i]}/electron.exe ${release_renames[$i]}/zmNinja.exe >/dev/null 2>&1
+        mv ${release_renames[$i]}/electron ${release_renames[$i]}/zmNinja >/dev/null 2>&1
+
+    else # OSX
+        exe ${UNZIP} electron-${REL}-${release_names[$i]}.zip  2>/dev/null 
+        exe mv Electron.app ${release_renames[$i]}
+        
+    fi 
+    
+    rm LICENSE* >/dev/null 2>&1
+    rm version >/dev/null 2>&1
+done
+
+rm *.zip >/dev/null 2>&1
+
+echo
+echo =========================================================
+echo All done. Use ./make_desktop now
+echo You need to associate icons for OSX and windows
+echo for OSX
+echo =========================================================
+echo
+
+