From ca94bfc25d8706a051d4486616bed6f5c291e76a Mon Sep 17 00:00:00 2001 From: Tangem Date: Mon, 2 Jul 2018 12:43:49 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .../data/network/task/ElectrumTask.java | 4 --- .../presentation/fragment/LoadedWallet.java | 25 ++++++++----------- 2 files changed, 11 insertions(+), 18 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 6ab6426418..0d3cbedb0f 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 @@ -7,19 +7,15 @@ import com.tangem.data.network.request.ElectrumRequest; import com.tangem.domain.wallet.SharedData; import java.io.BufferedReader; -import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.net.InetAddress; import java.net.InetSocketAddress; -import java.net.ServerSocket; import java.net.Socket; import java.util.ArrayList; import java.util.List; -import java.util.Random; -import java.util.concurrent.ThreadLocalRandom; /** * Created by dvol on 16.07.2017. diff --git a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.java b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.java index 6edf42b785..3ba93eeb68 100644 --- a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.java +++ b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.java @@ -130,6 +130,7 @@ public class LoadedWallet extends Fragment implements SwipeRefreshLayout.OnRefre } + private class ETHRequestTask extends InfuraTask { ETHRequestTask(Blockchain blockchain) { super(blockchain); @@ -411,7 +412,7 @@ public class LoadedWallet extends Fragment implements SwipeRefreshLayout.OnRefre updateTasks.add(updateWalletInfoTask); - updateWalletInfoTask.execute(ElectrumRequest.GetHeader(mWalletAddress, String.valueOf(height)), + updateWalletInfoTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, ElectrumRequest.GetHeader(mWalletAddress, String.valueOf(height)), ElectrumRequest.GetTransaction(mWalletAddress, hash)); } } @@ -451,7 +452,7 @@ public class LoadedWallet extends Fragment implements SwipeRefreshLayout.OnRefre UpdateWalletInfoTask updateWalletInfoTask = new UpdateWalletInfoTask(nodeAddress, nodePort); updateTasks.add(updateWalletInfoTask); - updateWalletInfoTask.execute(ElectrumRequest.GetHeader(mWalletAddress, String.valueOf(height)), + updateWalletInfoTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, ElectrumRequest.GetHeader(mWalletAddress, String.valueOf(height)), ElectrumRequest.GetTransaction(mWalletAddress, hash)); } @@ -922,15 +923,11 @@ public class LoadedWallet extends Fragment implements SwipeRefreshLayout.OnRefre int nodePort = engine.GetNextNodePort(mCard); UpdateWalletInfoTask connectTaskEx = new UpdateWalletInfoTask(nodeAddress, nodePort, data); connectTaskEx.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, ElectrumRequest.CheckBalance(mCard.getWallet())); - } - String nodeAddress = Objects.requireNonNull(engine).GetNode(mCard); - int nodePort = engine.GetNodePort(mCard); - UpdateWalletInfoTask updateWalletInfoTask = new UpdateWalletInfoTask(nodeAddress, nodePort, data); - updateTasks.add(updateWalletInfoTask); - updateWalletInfoTask.execute(ElectrumRequest.ListUnspent(mCard.getWallet()) - , ElectrumRequest.ListHistory(mCard.getWallet()) - ); + UpdateWalletInfoTask updateWalletInfoTask = new UpdateWalletInfoTask(nodeAddress, nodePort, data); + updateTasks.add(updateWalletInfoTask); + updateWalletInfoTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, ElectrumRequest.ListUnspent(mCard.getWallet())); + } RateInfoTask taskRate = new RateInfoTask(); ExchangeRequest rate = ExchangeRequest.GetRate(mCard.getWallet(), "bitcoin", "bitcoin"); @@ -951,8 +948,8 @@ public class LoadedWallet extends Fragment implements SwipeRefreshLayout.OnRefre UpdateWalletInfoTask updateWalletInfoTask = new UpdateWalletInfoTask(nodeAddress, nodePort, data); updateTasks.add(updateWalletInfoTask); - updateWalletInfoTask.execute(ElectrumRequest.ListUnspent(mCard.getWallet()) - , ElectrumRequest.ListHistory(mCard.getWallet()) + updateWalletInfoTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, ElectrumRequest.ListUnspent(mCard.getWallet()) +// ElectrumRequest.ListHistory(mCard.getWallet()) ); RateInfoTask taskRate = new RateInfoTask(); @@ -1360,13 +1357,13 @@ public class LoadedWallet extends Fragment implements SwipeRefreshLayout.OnRefre int nodePort = engine.GetNodePort(mCard); UpdateWalletInfoTask connectTask = new UpdateWalletInfoTask(nodeAddress, nodePort); - connectTask.execute(ElectrumRequest.Broadcast(mCard.getWallet(), tx)); + connectTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, ElectrumRequest.Broadcast(mCard.getWallet(), tx)); } else if (mCard.getBlockchain() == Blockchain.BitcoinCash || mCard.getBlockchain() == Blockchain.BitcoinCashTestNet) { String nodeAddress = engine.GetNode(mCard); int nodePort = engine.GetNodePort(mCard); UpdateWalletInfoTask connectTask = new UpdateWalletInfoTask(nodeAddress, nodePort); - connectTask.execute(ElectrumRequest.Broadcast(mCard.getWallet(), tx)); + connectTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, ElectrumRequest.Broadcast(mCard.getWallet(), tx)); } }