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

Fix regex

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2017-09-09 19:23:46 -03:00
commit 0c67f02754
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/js/controllers/addressbookAdd.js
View file

@ -14,7 +14,7 @@ angular.module('copayApp.controllers').controller('addressbookAddController', fu
$timeout(function() { $timeout(function() {
var form = addressbookForm; var form = addressbookForm;
if (data && form) { if (data && form) {
data = data.replace(/^bitcoin[cash]*:/, ''); data = data.replace(/^bitcoin(cash)?:/, '');
form.address.$setViewValue(data); form.address.$setViewValue(data);
form.address.$isValid = true; form.address.$isValid = true;
form.address.$render(); form.address.$render();

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

@ -69,8 +69,8 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
}, 100); }, 100);
} }
// data extensions for Payment Protocol with non-backwards-compatible request // data extensions for Payment Protocol with non-backwards-compatible request
if ((/^bitcoin[cash]*:\?r=[\w+]/).exec(data)) { if ((/^bitcoin(cash)?:\?r=[\w+]/).exec(data)) {
data = decodeURIComponent(data.replace(/bitcoin[cash]*:?r=/, '')); data = decodeURIComponent(data.replace(/bitcoin(cash)?:\?r=/, ''));
$state.go('tabs.send', {}, { $state.go('tabs.send', {}, {
'reload': true, 'reload': true,
'notify': $state.current.name == 'tabs.send' ? false : true 'notify': $state.current.name == 'tabs.send' ? false : true
@ -85,9 +85,9 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
data = sanitizeUri(data); data = sanitizeUri(data);
// Bitcoin or Bitcoin Cash URL // Bitcoin or Bitcoin Cash URL
if ((/^bitcoin[cash]*:/).exec(data)) { if ((/^bitcoin(cash)?:/).exec(data)) {
var coin = 'btc'; var coin = 'btc';
if ((/^bitcoincash*:/).exec(data)) { if ((/^bitcoincash:/).exec(data)) {
coin = 'bch'; coin = 'bch';
data = data.replace(/bitcoincash*:/, 'bitcoin:'); data = data.replace(/bitcoincash*:/, 'bitcoin:');
} }

4
src/js/services/openURL.js
View file

@ -57,10 +57,10 @@ angular.module('copayApp.services').factory('openURLService', function($rootScop
// This event is sent to an existent instance of Copay (only for standalone apps) // This event is sent to an existent instance of Copay (only for standalone apps)
gui.App.on('open', function(pathData) { gui.App.on('open', function(pathData) {
if (pathData.indexOf(/^bitcoin[cash]*:/) != -1) { if (pathData.indexOf(/^bitcoin(cash)?:/) != -1) {
$log.debug('Bitcoin URL found'); $log.debug('Bitcoin URL found');
handleOpenURL({ handleOpenURL({
url: pathData.substring(pathData.indexOf(/^bitcoin[cash]*:/)) url: pathData.substring(pathData.indexOf(/^bitcoin(cash)?:/))
}); });
} else if (pathData.indexOf(appConfigService.name + '://') != -1) { } else if (pathData.indexOf(appConfigService.name + '://') != -1) {
$log.debug(appConfigService.name + ' URL found'); $log.debug(appConfigService.name + ' URL found');