#621 corrected wrong plugin - android was not working

ZoneMinder · May 4, 2018 · 3d481b2 · 3d481b2
1 parent 0381509
commit 3d481b2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/config.xml b/config.xml
@@ -104,9 +104,6 @@
     <icon src="resources/android/icon/drawable-xhdpi-icon.png" />
     <preference name="SplashShowOnlyFirstTime" value="false" />
     <plugin name="com.telerik.plugins.nativepagetransitions" spec="^0.6.5" />
-    <plugin name="cordova-library-helper" spec="^1.0.4">
-        <variable name="PHOTO_LIBRARY_USAGE_DESCRIPTION" value="Save media to your Camera Roll" />
-    </plugin>
     <plugin name="cordova-plugin-android-permissions" spec="^1.0.0" />
     <plugin name="cordova-plugin-app-version" spec="^0.1.9" />
     <plugin name="cordova-plugin-console" spec="^1.1.0" />
@@ -148,6 +145,7 @@
     <plugin name="cordova-plugin-add-swift-support" spec="^1.7.1" />
     <plugin name="cordova-plugin-certificates" spec="https://github.com/hypery2k/cordova-certificate-plugin.git" />
     <plugin name="ionic-plugin-keyboard" spec="^2.2.1" />
+    <plugin name="cordova-library-helper" spec="https://github.com/FlyingDonkeyDev/cordova-library-helper.git" />
     <engine name="ios" spec="^4.5.4" />
     <engine name="android" spec="^6.3.0" />
 </widget>
diff --git a/package.json b/package.json
@@ -9,9 +9,6 @@
     ],
     "plugins": {
       "com.telerik.plugins.nativepagetransitions": {},
-      "cordova-library-helper": {
-        "PHOTO_LIBRARY_USAGE_DESCRIPTION": "Save media to your Camera Roll"
-      },
       "cordova-plugin-android-permissions": {},
       "cordova-plugin-app-version": {},
       "cordova-plugin-console": {},
@@ -52,7 +49,8 @@
       "cordova-plugin-file": {},
       "cordova-plugin-add-swift-support": {},
       "cordova-plugin-certificates": {},
-      "ionic-plugin-keyboard": {}
+      "ionic-plugin-keyboard": {},
+      "cordova-library-helper": {}
     }
   },
   "dependencies": {
@@ -63,7 +61,7 @@
     "cordova-android": "^6.3.0",
     "cordova-custom-config": "~4.0.2",
     "cordova-ios": "^4.5.4",
-    "cordova-library-helper": "^1.0.4",
+    "cordova-library-helper": "git+https://github.com/FlyingDonkeyDev/cordova-library-helper.git",
     "cordova-plugin-add-swift-support": "^1.7.1",
     "cordova-plugin-android-fingerprint-auth": "^1.4.0",
     "cordova-plugin-android-permissions": "^1.0.0",

diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
@@ -810,6 +810,7 @@ angular.module('zmApp.controllers')
 
     };
 
+
     $scope.downloadFileToDevice = function(path, eid)
     {
 
@@ -821,7 +822,14 @@ angular.module('zmApp.controllers')
             tp = cordova.file.dataDirectory + "temp-video.mp4";
 
         var th = true;
+
         var opt = {};
+
+        if ($rootScope.basicAuthHeader) {
+            opt.headers = {"Authorization": $rootScope.basicAuthHeader};
+            NVRDataModel.debug ("download with auth options is:"+JSON.stringify(opt));
+        }
+
         //path = "http://techslides.com/demos/sample-videos/small.mp4";
 
         NVRDataModel.debug("Saving temporary video to: " + tp);