This commit is contained in:
Gustavo Maximiliano Cortez 2015-09-29 12:51:08 -03:00
parent 35476ce1ab
commit e884b4e7d7
No known key found for this signature in database
GPG Key ID: 15EDAD8D9F2EB1AF
1 changed files with 4 additions and 13 deletions

View File

@ -1019,21 +1019,12 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
return newUri;
};
function backwardCompatible(uri) {
var regex = /^bitcoin:\?r=[\w+]/;
var match = regex.exec(uri);
if (!match || match.length === 0) {
return false;
} else {
return decodeURIComponent(uri.replace('bitcoin:?r=', ''));
}
}
var backwardCompatibleUri = backwardCompatible(uri);
var satToUnit = 1 / this.unitToSatoshi;
if (backwardCompatibleUri) {
this.setFromPayPro(backwardCompatibleUri, function(err) {
// URI extensions for Payment Protocol with non-backwards-compatible request
if ((/^bitcoin:\?r=[\w+]/).exec(uri)) {
uri = decodeURIComponent(uri.replace('bitcoin:?r=', ''));
this.setFromPayPro(uri, function(err) {
if (err) {
return err;
}