From b85b4e7552fdc62c6b92b03a5935fbe245faf231 Mon Sep 17 00:00:00 2001 From: Tangem Date: Mon, 6 Aug 2018 11:17:46 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .../com/tangem/presentation/fragment/LoadedWallet.kt | 12 +++++++++++- app/src/main/res/layout/activity_confirm_payment.xml | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) 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 5f06fa66bd..119c65afc9 100644 --- a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt +++ b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt @@ -438,15 +438,20 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific mCard!!.resetFailedBalanceRequestCounter() mCard!!.setIsBalanceEqual(true) for (i in 0 until data.allRequest) { + val nodeAddress = engine!!.GetNextNode(mCard) val nodePort = engine.GetNextNodePort(mCard) + + // check balance val connectTaskEx = UpdateWalletInfoTask(this@LoadedWallet, nodeAddress, nodePort, data) connectTaskEx.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, ElectrumRequest.CheckBalance(mCard!!.wallet)) + // list unspent input val updateWalletInfoTask = UpdateWalletInfoTask(this@LoadedWallet, nodeAddress, nodePort, data) updateWalletInfoTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, ElectrumRequest.ListUnspent(mCard!!.wallet)) } + // course request val taskRate = RateInfoTask(this@LoadedWallet) val rate = ExchangeRequest.GetRate(mCard!!.wallet, "bitcoin", "bitcoin") taskRate.execute(rate) @@ -459,6 +464,8 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific for (i in 0 until data.allRequest) { val nodeAddress = engine!!.GetNextNode(mCard) val nodePort = engine.GetNextNodePort(mCard) + + // check balance val connectTaskEx = UpdateWalletInfoTask(this@LoadedWallet, nodeAddress, nodePort, data) connectTaskEx.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, ElectrumRequest.CheckBalance(mCard!!.wallet)) } @@ -466,9 +473,11 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific val nodeAddress = engine!!.GetNode(mCard) val nodePort = engine.GetNodePort(mCard) + // list unspent input val updateWalletInfoTask = UpdateWalletInfoTask(this@LoadedWallet, nodeAddress, nodePort, data) updateWalletInfoTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, ElectrumRequest.ListUnspent(mCard!!.wallet)) + // course request val taskRate = RateInfoTask(this@LoadedWallet) val rate = ExchangeRequest.GetRate(mCard!!.wallet, "bitcoin-cash", "bitcoin-cash") taskRate.execute(rate) @@ -486,6 +495,7 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific updateETH.execute(reqETH, reqNonce) + // course request val taskRate = RateInfoTask(this@LoadedWallet) val rate = ExchangeRequest.GetRate(mCard!!.wallet, "ethereum", "ethereum") taskRate.execute(rate) @@ -505,7 +515,7 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific reqNonce.setBlockchain(mCard!!.blockchain) updateETH.execute(reqETH, reqNonce, reqBalance) - + // course request val taskRate = RateInfoTask(this@LoadedWallet) val rate = ExchangeRequest.GetRate(mCard!!.wallet, "ethereum", "ethereum") taskRate.execute(rate) diff --git a/app/src/main/res/layout/activity_confirm_payment.xml b/app/src/main/res/layout/activity_confirm_payment.xml index 782a42208f..142ec7c5da 100644 --- a/app/src/main/res/layout/activity_confirm_payment.xml +++ b/app/src/main/res/layout/activity_confirm_payment.xml @@ -319,7 +319,7 @@ android:textSize="@dimen/text_size_large" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" - app:layout_constraintRight_toRightOf="parent" /> + app:layout_constraintRight_toRightOf="parent"/>