anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

make action sheet come up if non paypro url has been scanned

Browse source
This commit is contained in:
Marty Alcala 2016-10-14 10:33:36 -04:00
commit 73c3f1853d
5 changed files with 43 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/js/services/incomingData.js
View file

@ -1,10 +1,14 @@
'use strict';
angular.module('copayApp.services').factory('incomingData', function($log, $ionicModal, $state, $window, $timeout, bitcore, profileService, popupService, ongoingProcess, platformInfo, gettextCatalog) {
angular.module('copayApp.services').factory('incomingData', function($log, $ionicModal, $state, $window, $timeout, bitcore, profileService, popupService, ongoingProcess, platformInfo, gettextCatalog, scannerService, $rootScope) {
var root = {};
root.redir = function(data) {
root.showMenu = function() {
$rootScope.$broadcast('incomingDataMenu.showMenu');
};
root.redir = function(data, resumeScan) {
$log.debug('Processing incoming data:' +data);
function sanitizeUri(data) {
@ -66,6 +70,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $ioni
getPayProDetails(data, function(err, details) {
if(err) {
console.log('getPayProDetails err', err);
root.showMenu();
return;
}
console.log('paypro details', details);
@ -143,12 +148,12 @@ angular.module('copayApp.services').factory('incomingData', function($log, $ioni
ongoingProcess.set('fetchingPayPro', false);
if (err) {
$log.warn('Could not fetch payment request:', err);
var msg = err.toString();
if (msg.match('HTTP')) {
msg = gettextCatalog.getString('Could not fetch payment information');
}
popupService.showAlert(msg);
// $log.warn('Could not fetch payment request:', err);
// var msg = err.toString();
// if (msg.match('HTTP')) {
// msg = gettextCatalog.getString('Could not fetch payment information');
// }
// popupService.showAlert(msg);
return cb(true);
}

22
src/js/services/scannerService.js
View file

@ -1,9 +1,9 @@
'use strict';
angular.module('copayApp.services').service('scannerService', function($log, $timeout, platformInfo, $rootScope) {
angular.module('copayApp.services').service('scannerService', function($log, $timeout, platformInfo, $rootScope, $window) {
var isDesktop = !platformInfo.isCordova;
var QRScanner = window.QRScanner;
var QRScanner = $window.QRScanner;
var lightEnabled = false;
var backCamera = true; // the plugin defaults to the back camera
@ -55,8 +55,8 @@ angular.module('copayApp.services').service('scannerService', function($log, $ti
canEnableLight: canEnableLight,
canChangeCamera: canChangeCamera,
canOpenSettings: canOpenSettings
}
}
};
};
var initializeStarted = false;
/**
@ -123,10 +123,10 @@ angular.module('copayApp.services').service('scannerService', function($log, $ti
}
this.isInitialized = function(){
return initializeCompleted;
}
};
this.initializeStarted = function(){
return initializeStarted;
}
};
var nextHide = null;
var nextDestroy = null;
@ -167,6 +167,14 @@ angular.module('copayApp.services').service('scannerService', function($log, $ti
QRScanner.scan(callback);
};
this.pausePreview = function() {
QRScanner.pausePreview();
};
this.resumePreview = function() {
QRScanner.resumePreview();
};
/**
* Deactivate the QRScanner. To balance user-perceived performance and power
* consumption, this kicks off a countdown which will "sleep" the scanner
@ -177,7 +185,7 @@ angular.module('copayApp.services').service('scannerService', function($log, $ti
*/
this.deactivate = function(callback) {
$log.debug('Deactivating scanner...');
// QRScanner.cancelScan();
QRScanner.cancelScan();
nextHide = $timeout(_hide, hideAfterSeconds * 1000);
nextDestroy = $timeout(_destroy, destroyAfterSeconds * 1000);
};