Fix updating of account active state for Tron

horizontalsystems · Feb 21, 2024 · c2eb452 · c2eb452
1 parent 3ba1dd6
commit c2eb452
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 11 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -280,7 +280,7 @@ dependencies {
     implementation 'com.github.horizontalsystems:binance-chain-kit-android:c1509a2'
     implementation 'com.github.horizontalsystems:market-kit-android:2efec77'
     implementation 'com.github.horizontalsystems:solana-kit-android:6401968'
-    implementation 'com.github.horizontalsystems:tron-kit-android:f2f7c9a'
+    implementation 'com.github.horizontalsystems:tron-kit-android:2e64640'
     // Zcash SDK
     implementation "cash.z.ecc.android:zcash-android-sdk:2.0.1"
     implementation("io.github.binance:binance-connector-java:3.0.0rc2") {

diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/core/Interfaces.kt b/app/src/main/java/io/horizontalsystems/bankwallet/core/Interfaces.kt
@@ -291,8 +291,9 @@ interface IReceiveAdapter {
     val receiveAddress: String
     val isMainNet: Boolean
 
-    val isAccountActive: Boolean
-        get() = true
+    suspend fun isAddressActive(address: String): Boolean {
+        return true
+    }
 
     fun usedAddresses(change: Boolean): List<UsedAddress> {
         return listOf()

diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/core/adapters/BaseTronAdapter.kt b/app/src/main/java/io/horizontalsystems/bankwallet/core/adapters/BaseTronAdapter.kt
@@ -28,15 +28,19 @@ abstract class BaseTronAdapter(
 
     // IReceiveAdapter
 
-    override val isAccountActive: Boolean
-        get() = tronKit.isAccountActive
+    override suspend fun isAddressActive(address: String): Boolean {
+        val tronAddress = Address.fromBase58(address)
+        return tronKit.isAccountActive(tronAddress)
+    }
 
     override val receiveAddress: String
         get() = tronKit.address.base58
 
     override val isMainNet: Boolean
         get() = tronKit.network == Network.Mainnet
 
+    // ISendTronAdapter
+
     suspend fun isAddressActive(address: Address): Boolean = withContext(Dispatchers.IO) {
         tronKit.isAccountActive(address)
     }

diff --git a/...ava/io/horizontalsystems/bankwallet/modules/receive/viewmodels/ReceiveAddressViewModel.kt b/...ava/io/horizontalsystems/bankwallet/modules/receive/viewmodels/ReceiveAddressViewModel.kt
@@ -19,8 +19,10 @@ import io.horizontalsystems.bankwallet.entities.Wallet
 import io.horizontalsystems.bankwallet.modules.receive.ReceiveModule
 import io.horizontalsystems.bankwallet.modules.receive.ReceiveModule.AdditionalData
 import io.horizontalsystems.marketkit.models.TokenType
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.reactive.asFlow
+import kotlinx.coroutines.withContext
 import java.math.BigDecimal
 
 class ReceiveAddressViewModel(
@@ -57,13 +59,15 @@ class ReceiveAddressViewModel(
         private set
 
     init {
-        viewModelScope.launch {
+        viewModelScope.launch(Dispatchers.IO) {
             adapterManager.adaptersReadyObservable.asFlow()
                 .collect {
                     setData()
                 }
         }
-        setData()
+        viewModelScope.launch(Dispatchers.IO) {
+            setData()
+        }
         setNetworkName()
     }
 
@@ -97,20 +101,22 @@ class ReceiveAddressViewModel(
         else null
     }
 
-    private fun setData() {
+    private suspend fun setData() {
         val adapter = adapterManager.getReceiveAdapterForWallet(wallet)
         if (adapter != null) {
             address = adapter.receiveAddress
             usedAddresses = adapter.usedAddresses(false)
             usedChangeAddresses = adapter.usedAddresses(true)
             uri = getUri()
-            accountActive = adapter.isAccountActive
+            accountActive = adapter.isAddressActive(adapter.receiveAddress)
             mainNet = adapter.isMainNet
             viewState = ViewState.Success
         } else {
             viewState = ViewState.Error(NullPointerException())
         }
-        syncState()
+        withContext(Dispatchers.Main) {
+            syncState()
+        }
     }
 
     private fun getUri(): String {
@@ -164,7 +170,9 @@ class ReceiveAddressViewModel(
     }
 
     fun onErrorClick() {
-        setData()
+        viewModelScope.launch(Dispatchers.IO) {
+            setData()
+        }
     }
 
     fun setAmount(amount: BigDecimal?) {