From 7a4292f489a6ad7ec87abea3bd19c3b795b0c3b9 Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 11 Oct 2018 20:05:44 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .../data/network/ServerApiHelperElectrum.java | 20 +++++++++---------- .../presentation/fragment/LoadedWallet.kt | 4 ++-- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/tangem/data/network/ServerApiHelperElectrum.java b/app/src/main/java/com/tangem/data/network/ServerApiHelperElectrum.java index e03d86bc4e..2b317d0b95 100644 --- a/app/src/main/java/com/tangem/data/network/ServerApiHelperElectrum.java +++ b/app/src/main/java/com/tangem/data/network/ServerApiHelperElectrum.java @@ -22,15 +22,13 @@ import java.util.List; import java.util.Random; import io.reactivex.Observable; -import io.reactivex.ObservableSource; import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.functions.Consumer; -import io.reactivex.functions.Function; import io.reactivex.observers.DefaultObserver; import io.reactivex.schedulers.Schedulers; public class ServerApiHelperElectrum { - private static String TAG = ServerApiHelper.class.getSimpleName(); +// private static String TAG = ServerApiHelper.class.getSimpleName(); + private static String TAG = ServerApiHelperElectrum.class.getSimpleName(); /** * TCP @@ -67,13 +65,13 @@ public class ServerApiHelperElectrum { .filter(throwable -> throwable instanceof NullPointerException) .zipWith(Observable.range(1, 2), (n, i) -> i)) - .retryWhen(errors -> errors - .filter(throwable -> throwable instanceof Exception) - .zipWith(Observable.range(1, 2), (n, i) -> i)) - - .retryWhen(errors -> errors - .filter(throwable -> throwable instanceof ConnectException) - .zipWith(Observable.range(1, 2), (n, i) -> i)) +// .retryWhen(errors -> errors +// .filter(throwable -> throwable instanceof Exception) +// .zipWith(Observable.range(1, 2), (n, i) -> i)) +// +// .retryWhen(errors -> errors +// .filter(throwable -> throwable instanceof ConnectException) +// .zipWith(Observable.range(1, 2), (n, i) -> i)) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); 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 184bfc06c9..3f4bead7f4 100644 --- a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt +++ b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt @@ -265,7 +265,7 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific val height = jsUnspent.getInt("height") val hash = jsUnspent.getString("tx_hash") if (height != -1) { - requestElectrum(card!!, ElectrumRequest.getTransaction(walletAddress, hash)) +// requestElectrum(card!!, ElectrumRequest.getTransaction(walletAddress, hash)) } } } catch (e: JSONException) { @@ -869,7 +869,7 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific card!!.setIsBalanceEqual(true) requestElectrum(card!!, ElectrumRequest.checkBalance(card!!.wallet)) - requestElectrum(card!!, ElectrumRequest.listUnspent(card!!.wallet)) +// requestElectrum(card!!, ElectrumRequest.listUnspent(card!!.wallet)) requestRateInfo("bitcoin") }