diff --git a/i18n/po/template.pot b/i18n/po/template.pot index 9c0e3bdc6..c2208779b 100644 --- a/i18n/po/template.pot +++ b/i18n/po/template.pot @@ -3849,4 +3849,12 @@ msgstr "" #: src/js/services/incomingData.js:129 msgid "This invoice is no longer accepting payments" +msgstr "" + +#: src/js/controllers/tab-scan.js:120 +msgid "Scan Failed" +msgstr "" + +#: src/js/controllers/tab-scan.js:121 +msgid "Data not recognised." msgstr "" \ No newline at end of file diff --git a/src/js/controllers/tab-scan.js b/src/js/controllers/tab-scan.js index 4a654d91d..68e1e4dd0 100644 --- a/src/js/controllers/tab-scan.js +++ b/src/js/controllers/tab-scan.js @@ -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() {