From 12e8c14b3fd08be079e7ca51c1b96b06d8d53d0b Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Fri, 7 Sep 2018 13:21:08 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 app/build.gradle                              |  2 +-
 .../presentation/fragment/LoadedWallet.kt     | 32 +++++++------------
 2 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index bd7ec6e06e..19e75fcebb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,7 +15,7 @@ android {
         applicationId "com.tangem.wallet"
         minSdkVersion 21
         targetSdkVersion 27
-        versionCode 73
+        versionCode 74
         versionName "0.88.1." + generateVersionName()
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
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 5f195fffe5..f39a8395b2 100644
--- a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt
+++ b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt
@@ -42,6 +42,7 @@ import com.tangem.wallet.R
 import kotlinx.android.synthetic.main.fr_loaded_wallet.*
 import java.math.BigInteger
 import java.util.*
+import kotlin.concurrent.fixedRateTimer
 
 class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notifications, SharedPreferences.OnSharedPreferenceChangeListener {
     companion object {
@@ -74,7 +75,7 @@ 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()
+    private var timerRepeatRefresh: Timer? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -266,27 +267,11 @@ 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()
-
-        try {
-            timerRepeatRefresh.cancel()
-        } catch (e: IllegalStateException) {
-            e.printStackTrace()
-        }
+        if (timerRepeatRefresh != null)
+            timerRepeatRefresh!!.cancel()
     }
 
     override fun onStop() {
@@ -434,8 +419,15 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
                 if (resultCode == Activity.RESULT_OK) {
 //                    srlLoadedWallet!!.postDelayed({ refresh() }, 10000)
 //                    srlLoadedWallet!!.isRefreshing = true
+
+                    timerRepeatRefresh = fixedRateTimer(name = "refresh", initialDelay = 2000, period = 5000) {
+                        activity!!.runOnUiThread {
+                            refresh()
+                            Log.i("sfsf", "refresh")
+                        }
+                    }
                     card!!.clearInfo()
-                    repeatRefresh()
+
 //                    updateViews()
                 }