From 172ae105c226457d59cded87183cc9ad03779225 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Fri, 4 May 2018 09:43:30 -0400 Subject: #621 corrected wrong plugin - android was not working --- config.xml | 4 +--- package.json | 8 +++----- www/js/EventCtrl.js | 8 ++++++++ 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/config.xml b/config.xml index 703a5a26..11341f14 100644 --- a/config.xml +++ b/config.xml @@ -104,9 +104,6 @@ - - - @@ -148,6 +145,7 @@ + diff --git a/package.json b/package.json index deed262c..cfff6dbe 100644 --- 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 index 4fc2e42d..5be5226a 100644 --- 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); -- cgit v1.2.3