From b3a6a8dc9b8ed379c7d97516d47a0586b5b62ab6 Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 8 Nov 2018 12:21:22 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .../com/tangem/data/network/ElectrumRequest.java | 4 ++++ .../activity/SendTransactionActivity.kt | 14 ++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/tangem/data/network/ElectrumRequest.java b/app/src/main/java/com/tangem/data/network/ElectrumRequest.java index 956a25e823..e61b18008f 100644 --- a/app/src/main/java/com/tangem/data/network/ElectrumRequest.java +++ b/app/src/main/java/com/tangem/data/network/ElectrumRequest.java @@ -155,6 +155,10 @@ public class ElectrumRequest { return getAnswer().getJSONObject("result"); } + public JSONObject getError() throws JSONException { + return getAnswer().getJSONObject("error"); + } + public String getResultString() throws JSONException { return getAnswer().getString("result"); } diff --git a/app/src/main/java/com/tangem/presentation/activity/SendTransactionActivity.kt b/app/src/main/java/com/tangem/presentation/activity/SendTransactionActivity.kt index a7392e68a2..69ba91f531 100644 --- a/app/src/main/java/com/tangem/presentation/activity/SendTransactionActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/SendTransactionActivity.kt @@ -58,11 +58,10 @@ class SendTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallback { override fun onSuccess(electrumRequest: ElectrumRequest?) { if (electrumRequest!!.isMethod(ElectrumRequest.METHOD_SendTransaction)) { try { - val hashTX = electrumRequest.resultString - if (hashTX.length > 1) - finishWithSuccess() - else - finishWithError("empty hash") + if (electrumRequest.resultString.isEmpty()) + finishWithError("Rejected by node: " + electrumRequest.getError()) + + finishWithSuccess() } catch (e: JSONException) { e.printStackTrace() } @@ -82,9 +81,8 @@ class SendTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallback { ServerApiHelper.INFURA_ETH_SEND_RAW_TRANSACTION -> { try { //infuraResponse.result - it's HashTX - if (infuraResponse.result.isEmpty()) { - finishWithError("Rejected by server: " + infuraResponse.error) - } + if (infuraResponse.result.isEmpty()) + finishWithError("Rejected by node: " + infuraResponse.error) val nonce = (ctx.coinData!! as EthData).confirmedTXCount nonce.add(BigInteger.valueOf(1))