bug fixeds

tonkeeper · Oct 28, 2024 · 1df89c6 · 1df89c6
1 parent 2e47427
commit 1df89c6
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 7 deletions.
diff --git a/apps/wallet/data/account/src/main/java/com/tonapps/wallet/data/account/AccountRepository.kt b/apps/wallet/data/account/src/main/java/com/tonapps/wallet/data/account/AccountRepository.kt
@@ -1,5 +1,6 @@
 package com.tonapps.wallet.data.account
 
+import android.app.KeyguardManager
 import android.content.Context
 import android.util.Log
 import com.tonapps.blockchain.ton.contract.BaseWalletContract
@@ -45,7 +46,7 @@ import org.ton.contract.wallet.WalletTransfer
 import java.util.UUID
 
 class AccountRepository(
-    context: Context,
+    private val context: Context,
     private val api: API,
     private val rnLegacy: RNLegacy,
 ) {
@@ -62,6 +63,10 @@ class AccountRepository(
         data class Wallet(val wallet: WalletEntity) : SelectedState()
     }
 
+    private val keyguardManager by lazy {
+        context.getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager
+    }
+
     private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
     private val database = DatabaseSource(context, scope)
     private val storageSource: StorageSource by lazy { StorageSource(context) }
@@ -182,6 +187,10 @@ class AccountRepository(
     }
 
     suspend fun requestTonProofToken(wallet: WalletEntity): String? = withContext(scope.coroutineContext) {
+        if (keyguardManager.isDeviceLocked) {
+            return@withContext null
+        }
+
         if (!wallet.hasPrivateKey) {
             return@withContext null
         }
@@ -194,6 +203,7 @@ class AccountRepository(
         tonProofToken
     }
 
+
     private suspend fun saveTonProof(wallet: WalletEntity, token: String) = withContext(Dispatchers.IO) {
         storageSource.setTonProofToken(wallet.publicKey, token)
 

diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/history/HistoryHelper.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/history/HistoryHelper.kt
@@ -464,7 +464,7 @@ class HistoryHelper(
                 itemAction = ActionType.JettonBurn
                 accountAddress = jettonTransfer.recipient
                 value = value.withMinus
-            } else if (isOut) {
+            } else if (isOut || wallet.isMyAddress(jettonTransfer.sender?.address ?: "")) {
                 itemAction = ActionType.Send
                 accountAddress = jettonTransfer.recipient
                 value = value.withMinus
@@ -521,7 +521,7 @@ class HistoryHelper(
             val amount = Coins.of(tonTransfer.amount)
             var value = CurrencyFormatter.format("TON", amount, 2)
 
-            if (isOut) {
+            if (isOut || wallet.isMyAddress(tonTransfer.sender.address)) {
                 itemAction = ActionType.Send
                 accountAddress = tonTransfer.recipient
                 value = value.withMinus
@@ -605,7 +605,7 @@ class HistoryHelper(
                 itemAction = ActionType.JettonBurn
                 iconURL = nftItemTransfer.recipient?.iconURL
                 subtitle = api.getBurnAddress()
-            } else if (isOut) {
+            } else if (isOut || wallet.isMyAddress(nftItemTransfer.sender?.address ?: "")) {
                 itemAction = ActionType.NftSend
                 iconURL = nftItemTransfer.recipient?.iconURL
                 subtitle = sender?.getNameOrAddress(wallet.testnet, true) ?: ""

diff --git a/.../instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/browser/dapp/DAppViewModel.kt b/.../instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/browser/dapp/DAppViewModel.kt
@@ -2,6 +2,7 @@ package com.tonapps.tonkeeper.ui.screen.browser.dapp
 
 import android.app.Application
 import android.net.Uri
+import android.util.Log
 import com.tonapps.extensions.appVersionName
 import com.tonapps.extensions.filterList
 import com.tonapps.tonkeeper.manager.tonconnect.TonConnectManager
@@ -11,9 +12,16 @@ import com.tonapps.tonkeeper.ui.base.BaseWalletVM
 import com.tonapps.tonkeeper.worker.DAppPushToggleWorker
 import com.tonapps.wallet.data.account.entities.WalletEntity
 import com.tonapps.wallet.data.dapps.entities.AppConnectEntity
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.withTimeout
+import kotlinx.coroutines.withTimeoutOrNull
 import org.json.JSONObject
+import kotlin.time.Duration.Companion.seconds
 
 class DAppViewModel(
     app: Application,
@@ -23,7 +31,7 @@ class DAppViewModel(
 ): BaseWalletVM(app) {
 
     val connectionFlow = tonConnectManager.walletConnectionsFlow(wallet).filterList { connection ->
-        connection.appUrl == url && connection.type == AppConnectEntity.Type.Internal
+        connection.type == AppConnectEntity.Type.Internal && connection.appUrl == url
     }.map { it.firstOrNull() }
 
     fun mute() {
@@ -40,11 +48,22 @@ class DAppViewModel(
     }
 
     suspend fun restoreConnection(): JSONObject {
-        val connection = connectionFlow.firstOrNull()
+        val connection = loadConnection()
         return if (connection == null) {
             JsonBuilder.connectEventError(BridgeError.unknownApp())
         } else {
             JsonBuilder.connectEventSuccess(wallet, null, null, context.appVersionName)
         }
     }
+
+    private suspend fun loadConnection(): AppConnectEntity? = withTimeoutOrNull(2.seconds) {
+        while (isActive) {
+            val connection = connectionFlow.first()
+            if (connection != null) {
+                return@withTimeoutOrNull connection
+            }
+            delay(100)
+        }
+        return@withTimeoutOrNull null
+    }
 }
diff --git a/...pp/src/main/java/com/tonapps/tonkeeper/ui/screen/send/contacts/add/AddContactViewModel.kt b/...pp/src/main/java/com/tonapps/tonkeeper/ui/screen/send/contacts/add/AddContactViewModel.kt
@@ -1,7 +1,9 @@
 package com.tonapps.tonkeeper.ui.screen.send.contacts.add
 
 import android.app.Application
+import android.util.Log
 import androidx.lifecycle.viewModelScope
+import com.tonapps.blockchain.ton.extensions.isTestnetAddress
 import com.tonapps.extensions.bestMessage
 import com.tonapps.tonkeeper.ui.base.BaseWalletVM
 import com.tonapps.wallet.api.API
@@ -63,11 +65,15 @@ class AddContactViewModel(
         userInputAddressFlow.collectFlow { address ->
             if (address.isBlank()) {
                 _accountFlow.value = AddressAccount.Empty
+            } else if (address.contains(":")) {
+                _accountFlow.value = AddressAccount.Error
+            } else if (address.isTestnetAddress() && !wallet.testnet) {
+                _accountFlow.value = AddressAccount.Error
             } else {
                 _accountFlow.value = AddressAccount.Loading
 
                 val account = api.resolveAccount(address, wallet.testnet)
-                if (account == null || !account.isWallet || account.status != AccountStatus.active) {
+                if (account == null || !account.isWallet || account.status == AccountStatus.nonexist) {
                     _accountFlow.value = AddressAccount.Error
                 } else {
                     _accountFlow.value = AddressAccount.Success(account)

diff --git a/...app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/contacts/edit/EditContactScreen.kt b/...app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/contacts/edit/EditContactScreen.kt
@@ -5,6 +5,7 @@ import android.util.Log
 import android.view.View
 import android.widget.Button
 import com.tonapps.extensions.getParcelableCompat
+import com.tonapps.tonkeeper.extensions.copyToClipboard
 import com.tonapps.tonkeeper.extensions.hideKeyboard
 import com.tonapps.tonkeeper.koin.walletViewModel
 import com.tonapps.tonkeeper.ui.base.WalletContextScreen

diff --git a/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/extensions/AddrStd.kt b/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/extensions/AddrStd.kt
@@ -16,6 +16,10 @@ fun AddrStd.toAccountId(): String {
     ).lowercase()
 }
 
+fun String.isTestnetAddress(): Boolean {
+    return startsWith("0Q") || startsWith("kQ")
+}
+
 fun String.toUserFriendly(
     wallet: Boolean = true,
     testnet: Boolean,