From 55249439809b2a8b53e3c94e8a7998b062bb66f6 Mon Sep 17 00:00:00 2001 From: fuwa Date: Sat, 27 Oct 2018 10:33:33 +0000 Subject: [PATCH] adapt QR code scheme to use wownero prefix --- .../com/wownero/wownerujo/ReceiveFragment.java | 6 +++--- .../com/wownero/wownerujo/data/BarcodeData.java | 14 ++++++++------ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/wownero/wownerujo/ReceiveFragment.java b/app/src/main/java/com/wownero/wownerujo/ReceiveFragment.java index 57feb83..55e0208 100644 --- a/app/src/main/java/com/wownero/wownerujo/ReceiveFragment.java +++ b/app/src/main/java/com/wownero/wownerujo/ReceiveFragment.java @@ -405,14 +405,14 @@ public class ReceiveFragment extends Fragment { return; } StringBuffer sb = new StringBuffer(); - sb.append(BarcodeData.XMR_SCHEME).append(address); + sb.append(BarcodeData.WOW_SCHEME).append(address); boolean first = true; if (!paymentId.isEmpty()) { if (first) { sb.append("?"); first = false; } - sb.append(BarcodeData.XMR_PAYMENTID).append('=').append(paymentId); + sb.append(BarcodeData.WOW_PAYMENTID).append('=').append(paymentId); } if (!xmrAmount.isEmpty()) { if (first) { @@ -420,7 +420,7 @@ public class ReceiveFragment extends Fragment { } else { sb.append("&"); } - sb.append(BarcodeData.XMR_AMOUNT).append('=').append(xmrAmount); + sb.append(BarcodeData.WOW_AMOUNT).append('=').append(xmrAmount); } String text = sb.toString(); int size = Math.min(qrCode.getHeight(), qrCode.getWidth()); diff --git a/app/src/main/java/com/wownero/wownerujo/data/BarcodeData.java b/app/src/main/java/com/wownero/wownerujo/data/BarcodeData.java index 83a8379..871cf37 100644 --- a/app/src/main/java/com/wownero/wownerujo/data/BarcodeData.java +++ b/app/src/main/java/com/wownero/wownerujo/data/BarcodeData.java @@ -30,8 +30,10 @@ import timber.log.Timber; public class BarcodeData { public static final String XMR_SCHEME = "monero:"; - public static final String XMR_PAYMENTID = "tx_payment_id"; - public static final String XMR_AMOUNT = "tx_amount"; + public static final String WOW_SCHEME = "wownero:"; + public static final String WOW_PAYMENTID = "tx_payment_id"; + public static final String WOW_AMOUNT = "tx_amount"; + static final String BTC_SCHEME = "bitcoin:"; static final String BTC_AMOUNT = "amount"; @@ -93,9 +95,9 @@ public class BarcodeData { if (uri == null) return null; - if (!uri.startsWith(XMR_SCHEME)) return null; + if (!(uri.startsWith(XMR_SCHEME) || uri.startsWith(WOW_SCHEME))) return null; - String noScheme = uri.substring(XMR_SCHEME.length()); + String noScheme = uri.substring(uri.indexOf(":") + 1); Uri monero = Uri.parse(noScheme); Map parms = new HashMap<>(); String query = monero.getQuery(); @@ -111,8 +113,8 @@ public class BarcodeData { } } String address = monero.getPath(); - String paymentId = parms.get(XMR_PAYMENTID); - String amount = parms.get(XMR_AMOUNT); + String paymentId = parms.get(WOW_PAYMENTID); + String amount = parms.get(WOW_AMOUNT); if (amount != null) { try { Double.parseDouble(amount);