sparrowwallet/drongo
1
0
Fork 0
mirror of https://github.com/sparrowwallet/drongo.git synced 2024-12-26 01:56:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use URI instead of manual parsing

Browse source
This commit is contained in:
satsen 2022-04-13 13:38:59 +01:00
parent 20f4ac9657
commit d9831bdcd0
1 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/main/java/com/sparrowwallet/drongo/uri/BitcoinURI.java
View file

@ -87,9 +87,7 @@ public class BitcoinURI {
* @throws BitcoinURIParseException if the URI is not syntactically or semantically valid. * @throws BitcoinURIParseException if the URI is not syntactically or semantically valid.
*/ */
public BitcoinURI(String input) throws BitcoinURIParseException { public BitcoinURI(String input) throws BitcoinURIParseException {
String scheme = BITCOIN_SCHEME; // Attempt to parse the URI
// Attempt to form the URI (fail fast syntax checking to official standards).
URI uri; URI uri;
try { try {
uri = new URI(input); uri = new URI(input);
@ -100,23 +98,14 @@ public class BitcoinURI {
// URI is formed as bitcoin:<address>?<query parameters> // URI is formed as bitcoin:<address>?<query parameters>
// blockchain.info generates URIs of non-BIP compliant form bitcoin://address?.... // blockchain.info generates URIs of non-BIP compliant form bitcoin://address?....
// Remove the bitcoin scheme. if (!BITCOIN_SCHEME.equalsIgnoreCase(uri.getScheme())) {
// (Note: getSchemeSpecificPart() is not used as it unescapes the label and parse then fails.
// For instance with : bitcoin:129mVqKUmJ9uwPxKJBnNdABbuaaNfho4Ha?amount=0.06&label=Tom%20%26%20Jerry
// the & (%26) in Tom and Jerry gets interpreted as a separator and the label then gets parsed
// as 'Tom ' instead of 'Tom & Jerry')
String blockchainInfoScheme = scheme + "://";
String correctScheme = scheme + ":";
String schemeSpecificPart;
final String inputLc = input.toLowerCase(Locale.US);
if(inputLc.startsWith(blockchainInfoScheme)) {
schemeSpecificPart = input.substring(blockchainInfoScheme.length());
} else if(inputLc.startsWith(correctScheme)) {
schemeSpecificPart = input.substring(correctScheme.length());
} else {
throw new BitcoinURIParseException("Unsupported URI scheme: " + uri.getScheme()); throw new BitcoinURIParseException("Unsupported URI scheme: " + uri.getScheme());
} }
String schemeSpecificPart = uri.getRawSchemeSpecificPart().startsWith("//")
? uri.getRawSchemeSpecificPart().substring(2)
: uri.getRawSchemeSpecificPart();
// Split off the address from the rest of the query parameters. // Split off the address from the rest of the query parameters.
String[] addressSplitTokens = schemeSpecificPart.split("\\?", 2); String[] addressSplitTokens = schemeSpecificPart.split("\\?", 2);
if(addressSplitTokens.length == 0) { if(addressSplitTokens.length == 0) {