From ca7684b83a280989040ef834a07993ba893be245 Mon Sep 17 00:00:00 2001 From: pokkst Date: Tue, 20 Sep 2022 12:09:24 -0500 Subject: [PATCH] monero spec, from what i've found, says to use tx_amount for amount in uri. some places just use "amount" like BTC or other coins like that --- app/src/main/java/net/mynero/wallet/util/Constants.java | 1 + app/src/main/java/net/mynero/wallet/util/UriData.java | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/net/mynero/wallet/util/Constants.java b/app/src/main/java/net/mynero/wallet/util/Constants.java index e43b7cd..5ed4662 100644 --- a/app/src/main/java/net/mynero/wallet/util/Constants.java +++ b/app/src/main/java/net/mynero/wallet/util/Constants.java @@ -12,5 +12,6 @@ public class Constants { public static final String URI_PREFIX = "monero:"; public static final String URI_ARG_AMOUNT = "tx_amount"; + public static final String URI_ARG_AMOUNT2 = "amount"; public static final String NAV_ARG_TXINFO = "nav_arg_txinfo"; } diff --git a/app/src/main/java/net/mynero/wallet/util/UriData.java b/app/src/main/java/net/mynero/wallet/util/UriData.java index d6a899b..b519210 100644 --- a/app/src/main/java/net/mynero/wallet/util/UriData.java +++ b/app/src/main/java/net/mynero/wallet/util/UriData.java @@ -22,11 +22,15 @@ public class UriData { } public String getAmount() { - return params.get(Constants.URI_ARG_AMOUNT); + String txAmount = params.get(Constants.URI_ARG_AMOUNT); + if(txAmount == null) { + return params.get(Constants.URI_ARG_AMOUNT2); + } + return txAmount; } public boolean hasAmount() { - return params.containsKey(Constants.URI_ARG_AMOUNT); + return params.containsKey(Constants.URI_ARG_AMOUNT) || params.containsKey(Constants.URI_ARG_AMOUNT2); } public static UriData parse(String uri) {