From 9ac6554decbb5c6e664bb8f1fec326f75fe03c60 Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 15 Aug 2018 18:52:55 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .../data/network/task/ElectrumTask.java | 9 +++-- .../loaded_wallet/UpdateWalletInfoTask.java | 19 +++-------- .../com/tangem/domain/wallet/SharedData.java | 34 ++++++++----------- .../presentation/fragment/LoadedWallet.kt | 10 +++--- 4 files changed, 27 insertions(+), 45 deletions(-) diff --git a/app/src/main/java/com/tangem/data/network/task/ElectrumTask.java b/app/src/main/java/com/tangem/data/network/task/ElectrumTask.java index 0d3cbedb0f..ad9286b880 100644 --- a/app/src/main/java/com/tangem/data/network/task/ElectrumTask.java +++ b/app/src/main/java/com/tangem/data/network/task/ElectrumTask.java @@ -54,9 +54,8 @@ public class ElectrumTask extends AsyncTask> " + request.answerData); } else { @@ -116,7 +115,7 @@ public class ElectrumTask extends AsyncTask listTx = loadedWallet.getCard().getUnspentTransactions(); for (TangemCard.UnspentTransaction tx : listTx) { - if (tx.txID.equals(txHash)) { + if (tx.txID.equals(txHash)) tx.Raw = raw; - } } List listHTx = loadedWallet.getCard().getHistoryTransactions(); @@ -239,14 +232,12 @@ public class UpdateWalletInfoTask extends ElectrumTask { tx.Raw = raw; try { ArrayList prevHashes = BTCUtils.getPrevTX(raw); - boolean isOur = false; for (byte[] hash : prevHashes) { String checkID = BTCUtils.toHex(hash); for (TangemCard.HistoryTransaction txForCheck : listHTx) { - if (txForCheck.txID == checkID) { + if (txForCheck.txID.equals(checkID)) isOur = true; - } } } diff --git a/app/src/main/java/com/tangem/domain/wallet/SharedData.java b/app/src/main/java/com/tangem/domain/wallet/SharedData.java index 6f162e1ce5..5a53595afe 100644 --- a/app/src/main/java/com/tangem/domain/wallet/SharedData.java +++ b/app/src/main/java/com/tangem/domain/wallet/SharedData.java @@ -7,24 +7,26 @@ import java.util.concurrent.atomic.AtomicInteger; * Created by Ilia on 12.04.2018. */ - -public class SharedData -{ +public class SharedData { public static int COUNT_REQUEST = 3; public AtomicInteger requestCounter; public int allRequest; public AtomicInteger errorRequest; - public BigDecimal payload; - public synchronized boolean UpdatePayload(BigDecimal value) - { - if(payload == null || payload.compareTo(value)!=0) - { + public SharedData(int requestCount) { + payload = BigDecimal.ZERO; + allRequest = requestCount; + errorRequest = new AtomicInteger(0); + requestCounter = new AtomicInteger(0); + } + + public synchronized boolean updatePayload(BigDecimal value) { + if (payload == null || payload.compareTo(value) != 0) { boolean isChange = true; - if(payload == null || payload == BigDecimal.ZERO) + if (payload == null || payload == BigDecimal.ZERO) isChange = false; - if(value!=BigDecimal.ZERO) + if (value != BigDecimal.ZERO) payload = value; else isChange = false; @@ -35,16 +37,8 @@ public class SharedData return false; } - public void SetErrorRequest(int val) - { - errorRequest = new AtomicInteger(val); + public void setErrorRequest(int val) { + errorRequest = new AtomicInteger(val); } - public SharedData(int requstCount) - { - payload = BigDecimal.ZERO; - allRequest = requstCount; - errorRequest = new AtomicInteger(0); - requestCounter = new AtomicInteger(0); - } } \ No newline at end of file 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 04c663da25..6c71db01fe 100644 --- a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt +++ b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt @@ -171,7 +171,7 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific val visibleFlag = engine?.inOutPutVisible() ?: true try { - ivQR.setImageBitmap(UtilHelper.generateQrCode(engine!!.getShareWalletUri(card).toString())) + ivQR.setImageBitmap(UtilHelper.generateQrCode(engine.getShareWalletUri(card).toString())) } catch (e: WriterException) { e.printStackTrace() } @@ -193,7 +193,7 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific srlLoadedWallet!!.setOnRefreshListener { this.refresh() } btnLookup.setOnClickListener { val engineClick = CoinEngineFactory.create(card!!.blockchain) - val browserIntent = Intent(Intent.ACTION_VIEW, engineClick!!.getShareWalletUriExplorer(card)) + val browserIntent = Intent(Intent.ACTION_VIEW, engineClick.getShareWalletUriExplorer(card)) startActivity(browserIntent) } btnCopy.setOnClickListener { doShareWallet(false) } @@ -221,7 +221,7 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific btnExtract.setOnClickListener { if (!card!!.hasBalanceInfo()) { showSingleToast(R.string.cannot_obtain_data_from_blockchain) - } else if (!engine!!.isBalanceNotZero(card)) + } else if (!engine.isBalanceNotZero(card)) showSingleToast(R.string.wallet_empty) else if (!engine.isBalanceAlterNotZero(card)) showSingleToast(R.string.not_enough_funds) @@ -436,8 +436,8 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific val data = SharedData(SharedData.COUNT_REQUEST) card!!.resetFailedBalanceRequestCounter() card!!.setIsBalanceEqual(true) - for (i in 0 until data.allRequest) { + for (i in 0 until data.allRequest) { val nodeAddress = engine!!.getNextNode(card) val nodePort = engine.getNextNodePort(card) @@ -455,7 +455,6 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific val rate = ExchangeRequest.GetRate(card!!.wallet, "bitcoin", "bitcoin") taskRate.execute(rate) - } else if (card!!.blockchain == Blockchain.BitcoinCash || card!!.blockchain == Blockchain.BitcoinCashTestNet) { card!!.resetFailedBalanceRequestCounter() val data = SharedData(SharedData.COUNT_REQUEST) @@ -481,7 +480,6 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific val rate = ExchangeRequest.GetRate(card!!.wallet, "bitcoin-cash", "bitcoin-cash") taskRate.execute(rate) - } else if (card!!.blockchain == Blockchain.Ethereum || card!!.blockchain == Blockchain.EthereumTestNet) { val updateETH = ETHRequestTask(this@LoadedWallet, card!!.blockchain) val reqETH = InfuraRequest.GetBalance(card!!.wallet)