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

Alert and resume scanning if data is not recognised.

Browse source
This commit is contained in:
Brendon Duncan 2018-08-29 18:28:37 +12:00
commit 529bdf3386
2 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/js/controllers/tab-scan.js
View file

@ -1,6 +1,6 @@
'use strict';
angular.module('copayApp.controllers').controller('tabScanController', function($scope, $log, $timeout, scannerService, incomingData, $state, $ionicHistory, $rootScope, $ionicNavBarDelegate) {
angular.module('copayApp.controllers').controller('tabScanController', function(bitcoinUriService, gettextCatalog, popupService, $scope, $log, $timeout, scannerService, incomingData, $state, $ionicHistory, $rootScope, $ionicNavBarDelegate) {
var scannerStates = {
unauthorized: 'unauthorized',
@ -111,7 +111,18 @@ angular.module('copayApp.controllers').controller('tabScanController', function(
// Sometimes (testing in Chrome, when reading QR Code) data is an object
// that has a string data.result.
contents = contents.result || contents;
incomingData.redir(contents);
var parsed = bitcoinUriService.parse(contents);
if (parsed.isValid) {
incomingData.redir(contents);
} else {
var title = gettextCatalog.getString('Scan Failed');
var msg = gettextCatalog.getString('Data not recognised.');
var okText = gettextCatalog.getString('OK');
popupService.showAlert(title, msg, function onAlertShown() {
scannerService.resumePreview();
}, okText);
}
}
$rootScope.$on('incomingDataMenu.menuHidden', function() {