From bd83012d03af77d5be36c98013180f59dfeb19df Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 4 Oct 2018 13:05:18 +0300 Subject: [PATCH] Updated on 2026-08-14 --- app/build.gradle | 2 +- .../presentation/activity/SendTransactionActivity.kt | 10 +++++----- .../com/tangem/presentation/fragment/LoadedWallet.kt | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index d0a45ddd96..e04915e0c1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,7 +15,7 @@ android { applicationId "com.tangem.wallet" minSdkVersion 21 targetSdkVersion 27 - versionCode 81 + versionCode 83 versionName "0.89.2." + generateVersionName() testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } 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 60bca2c30f..f2b89cb19a 100644 --- a/app/src/main/java/com/tangem/presentation/activity/SendTransactionActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/SendTransactionActivity.kt @@ -87,7 +87,7 @@ class SendTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallback // val err = msg!!.getJSONObject("error") // hashTX = err.getString("message") // LastSignStorage.setLastMessage(card!!.wallet, hashTX) - return@onInfuraSuccess + return } if (hashTX.startsWith("0x") || hashTX.startsWith("0X")) { @@ -96,13 +96,13 @@ class SendTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallback val bigInt = BigInteger(hashTX, 16) //TODO: очень плохой способ LastSignStorage.setTxWasSend(card!!.wallet) LastSignStorage.setLastMessage(card!!.wallet, "") - Log.e("TX_RESULT", hashTX) +// Log.e("TX_RESULT", hashTX) - val nonce = card!!.getConfirmedTXCount() + val nonce = card!!.confirmedTXCount nonce.add(BigInteger.valueOf(1)) - card!!.setConfirmedTXCount(nonce) - Log.e("TX_RESULT", hashTX) + card!!.confirmedTXCount = nonce +// Log.e("TX_RESULT", hashTX) finishWithSuccess() diff --git a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt index 28de933540..024620532c 100644 --- a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt +++ b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt @@ -407,7 +407,7 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific // val err = msg!!.getJSONObject("error") // hashTX = err.getString("message") // LastSignStorage.setLastMessage(card!!.wallet, hashTX) - return@onInfuraSuccess + return } if (hashTX.startsWith("0x") || hashTX.startsWith("0X")) {