Merge pull request #581 from rnicoll/1.7.2-dev-uri2

Remove any / from the end of a URI
This commit is contained in:
langerhans 2014-07-31 21:27:35 +02:00
commit 57253fface

View file

@ -108,7 +108,10 @@ bool parseBitcoinURI(const QUrl &uri, SendCoinsRecipient *out)
return false; return false;
SendCoinsRecipient rv; SendCoinsRecipient rv;
rv.address = uri.path(); QStringList addressParts = uri.path().split("/", QString::SkipEmptyParts, Qt::CaseSensitive);
rv.address = addressParts.isEmpty()
? ""
: addressParts.first();
rv.amount = 0; rv.amount = 0;
#if QT_VERSION < 0x050000 #if QT_VERSION < 0x050000
@ -171,6 +174,7 @@ bool parseBitcoinURI(QString uri, SendCoinsRecipient *out)
{ {
uri.replace(0, 11, "dogecoin:"); uri.replace(0, 11, "dogecoin:");
} }
QUrl uriInstance(uri); QUrl uriInstance(uri);
return parseBitcoinURI(uriInstance, out); return parseBitcoinURI(uriInstance, out);
} }