From 1fe704da314c8c1892ca654c0e67d8182254a66b Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Thu, 6 Sep 2018 15:04:50 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 app/build.gradle                              |  2 +-
 .../data/network/task/ElectrumTask.java       |  3 +-
 .../presentation/fragment/LoadedWallet.kt     | 36 +++++++++++++------
 3 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 6fb42da94e..452904f4c7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,7 +15,7 @@ android {
         applicationId "com.tangem.wallet"
         minSdkVersion 21
         targetSdkVersion 27
-        versionCode 71
+        versionCode 72
         versionName "0.88.1." + generateVersionName()
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
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 2d1855c16d..eb8f5e063d 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
@@ -60,7 +60,8 @@ public class ElectrumTask extends AsyncTask<ElectrumRequest, Integer, List<Elect
             Log.v(logTag, "Connecting..." + Host);
 //            Socket socket = new Socket(serverAddress, port);
             Socket socket = new Socket();
-            socket.setSoTimeout(5000);
+//            socket.setSoTimeout(5000);
+            socket.setSoTimeout(10000);
             socket.bind(new InetSocketAddress(0));
             socket.connect(new InetSocketAddress(serverAddress, Port));
 //            Log.i("effefefe", host);
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 20e5718675..a20d14a99a 100644
--- a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt
+++ b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt
@@ -73,6 +73,8 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
     private val inactiveColor: ColorStateList by lazy { resources.getColorStateList(R.color.primary) }
     private val activeColor: ColorStateList by lazy { resources.getColorStateList(R.color.colorAccent) }
 
+    private val timerRepeatRefresh = Timer()
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         nfcManager = NfcManager(activity, this)
@@ -112,21 +114,21 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
 
         btnExtract.backgroundTintList = inactiveColor
 
-        updateViews()
+//        updateViews()
 
-        if (!card!!.hasBalanceInfo()) {
-            srlLoadedWallet!!.isRefreshing = true
-            srlLoadedWallet!!.postDelayed({ this.refresh() }, 1000)
-        }
+//        if (!card!!.hasBalanceInfo()) {
+//            srlLoadedWallet!!.isRefreshing = true
+//            srlLoadedWallet!!.postDelayed({ refresh() }, 1000)
+//        }
 
-//        requestCardVerify()
+        repeatRefresh()
 
         startVerify(lastTag)
 
         tvWallet.text = card!!.wallet
 
         // set listeners
-        srlLoadedWallet!!.setOnRefreshListener { this.refresh() }
+        srlLoadedWallet!!.setOnRefreshListener { refresh() }
         btnLookup.setOnClickListener {
             val engineClick = CoinEngineFactory.create(card!!.blockchain)
             val browserIntent = Intent(Intent.ACTION_VIEW, engineClick.getShareWalletUriExplorer(card))
@@ -249,9 +251,22 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
         nfcManager!!.onResume()
     }
 
+    private fun repeatRefresh() {
+        val getBalance = object : TimerTask() {
+            override fun run() {
+                activity!!.runOnUiThread {
+                    refresh()
+//                    Log.i("efgrgegsdfgsd", "repeatRefresh")
+                }
+            }
+        }
+        timerRepeatRefresh.schedule(getBalance, 0, 5000)
+    }
+
     override fun onPause() {
         super.onPause()
         nfcManager!!.onPause()
+        timerRepeatRefresh.cancel()
     }
 
     override fun onStop() {
@@ -397,10 +412,11 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
             }
             REQUEST_CODE_SEND_PAYMENT, REQUEST_CODE_RECEIVE_PAYMENT -> {
                 if (resultCode == Activity.RESULT_OK) {
-                    srlLoadedWallet!!.postDelayed({ this.refresh() }, 10000)
-                    srlLoadedWallet!!.isRefreshing = true
+//                    srlLoadedWallet!!.postDelayed({ refresh() }, 10000)
+//                    srlLoadedWallet!!.isRefreshing = true
                     card!!.clearInfo()
-                    updateViews()
+                    repeatRefresh()
+//                    updateViews()
                 }
 
                 if (data != null && data.extras != null) {