Qortal/altcoinj
1
0
Fork 1
mirror of https://github.com/Qortal/altcoinj.git synced 2025-07-31 12:01:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

BitcoinURI: Allow uppercase schema.

Browse Source
This commit is contained in:
Andreas Schildbach
2019-03-22 21:36:47 +01:00
parent 7747532bd0
commit aba000750c
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/java/org/bitcoinj/uri/BitcoinURI.java
View File

@@ -146,9 +146,10 @@ public class BitcoinURI {
String blockchainInfoScheme = scheme + "://"; String blockchainInfoScheme = scheme + "://";
String correctScheme = scheme + ":"; String correctScheme = scheme + ":";
String schemeSpecificPart; String schemeSpecificPart;
if (input.startsWith(blockchainInfoScheme)) { final String inputLc = input.toLowerCase(Locale.US);
if (inputLc.startsWith(blockchainInfoScheme)) {
schemeSpecificPart = input.substring(blockchainInfoScheme.length()); schemeSpecificPart = input.substring(blockchainInfoScheme.length());
} else if (input.startsWith(correctScheme)) { } else if (inputLc.startsWith(correctScheme)) {
schemeSpecificPart = input.substring(correctScheme.length()); schemeSpecificPart = input.substring(correctScheme.length());
} else { } else {
throw new BitcoinURIParseException("Unsupported URI scheme: " + uri.getScheme()); throw new BitcoinURIParseException("Unsupported URI scheme: " + uri.getScheme());

11
core/src/test/java/org/bitcoinj/uri/BitcoinURITest.java
View File

@@ -29,6 +29,8 @@ import org.bitcoinj.core.SegwitAddress;
import static org.junit.Assert.*; import static org.junit.Assert.*;
import java.util.Locale;
public class BitcoinURITest { public class BitcoinURITest {
private BitcoinURI testObject = null; private BitcoinURI testObject = null;
@@ -101,6 +103,15 @@ public class BitcoinURITest {
assertEquals("Unexpected label", 20, testObject.getAddress().getHash().length); assertEquals("Unexpected label", 20, testObject.getAddress().getHash().length);
} }
@Test
public void testGood_uppercaseScheme() throws BitcoinURIParseException {
testObject = new BitcoinURI(MAINNET, BITCOIN_SCHEME.toUpperCase(Locale.US) + ":" + MAINNET_GOOD_ADDRESS);
assertEquals(MAINNET_GOOD_ADDRESS, testObject.getAddress().toString());
assertNull("Unexpected amount", testObject.getAmount());
assertNull("Unexpected label", testObject.getLabel());
assertEquals("Unexpected label", 20, testObject.getAddress().getHash().length);
}
@Test @Test
public void testGood_segwit() throws BitcoinURIParseException { public void testGood_segwit() throws BitcoinURIParseException {
testObject = new BitcoinURI(MAINNET, BITCOIN_SCHEME + ":" + MAINNET_GOOD_SEGWIT_ADDRESS); testObject = new BitcoinURI(MAINNET, BITCOIN_SCHEME + ":" + MAINNET_GOOD_SEGWIT_ADDRESS);