From 8f5eba7828d1edf76a277c71b34da237e8c8441f Mon Sep 17 00:00:00 2001 From: pliablepixels Date: Wed, 1 Jun 2016 11:29:50 -0400 Subject: switched plugins to reduce android permissions, added cast support - but it breaks in android, will likely disable Former-commit-id: 15807900f05d387579ade0f02081ac993f064757 --- www/js/LogCtrl.js | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) (limited to 'www/js/LogCtrl.js') diff --git a/www/js/LogCtrl.js b/www/js/LogCtrl.js index 6a366902..f7c2f66a 100644 --- a/www/js/LogCtrl.js +++ b/www/js/LogCtrl.js @@ -2,7 +2,7 @@ /* jslint browser: true*/ /* global saveAs, cordova,StatusBar,angular,console,moment */ -angular.module('zmApp.controllers').controller('zmApp.LogCtrl', ['$scope', '$rootScope','zm', '$ionicModal', 'ZMDataModel', '$ionicSideMenuDelegate', '$fileLogger', '$cordovaEmailComposer', '$ionicPopup', '$timeout', '$ionicHistory', '$state', '$interval', '$ionicLoading', '$tranaslate', function ($scope, $rootScope,zm, $ionicModal, ZMDataModel, $ionicSideMenuDelegate, $fileLogger, $cordovaEmailComposer, $ionicPopup, $timeout, $ionicHistory, $state, $interval, $ionicLoading, $translate) { +angular.module('zmApp.controllers').controller('zmApp.LogCtrl', ['$scope', '$rootScope','zm', '$ionicModal', 'ZMDataModel', '$ionicSideMenuDelegate', '$fileLogger', '$cordovaEmailComposer', '$ionicPopup', '$timeout', '$ionicHistory', '$state', '$interval', '$ionicLoading', '$translate', function ($scope, $rootScope,zm, $ionicModal, ZMDataModel, $ionicSideMenuDelegate, $fileLogger, $cordovaEmailComposer, $ionicPopup, $timeout, $ionicHistory, $state, $interval, $ionicLoading, $translate) { $scope.openMenu = function () { $ionicSideMenuDelegate.toggleLeft(); }; @@ -88,8 +88,11 @@ angular.module('zmApp.controllers').controller('zmApp.LogCtrl', ['$scope', '$roo //-------------------------------------------------------------------------- function sendEmailReally(logstring) { if (window.cordova) { + + + - $cordovaEmailComposer.isAvailable().then(function () { + // do my best to replace sensitive information var loginData = ZMDataModel.getLogin(); @@ -122,21 +125,11 @@ angular.module('zmApp.controllers').controller('zmApp.LogCtrl', ['$scope', '$roo logstring = logstring.replace(re4, ""); } - var email = { - to: zm.authoremail, - subject: $rootScope.appName + ' Logs', - body: logstring, - isHtml: false - }; - $cordovaEmailComposer.open(email) - .then(null, function () { - // user cancelled email - }); - }, function () { - ZMDataModel.zmLog("Email plugin not found", "error"); - }); + window.plugins.emailComposer.showEmailComposerWithCallback(callback,$rootScope.appName+' logs',logstring,[zm.authoremail]); + + } else { - console.log("Using default email client to send data"); + // console.log("Using default email client to send data"); var fname = $rootScope.appName+"-logs-" + moment().format('MMM-DD-YY_HH-mm-ss') + ".txt"; @@ -148,6 +141,11 @@ saveAs(blob, fname); } + function callback () + { + console.log ("EMAIL SENT"); + } + function loadLogs() { //console.log ("GETTING LOGS"); -- cgit v1.2.3