fix safe mode

tonkeeper · Nov 18, 2024 · 714d295 · 714d295
1 parent ec6edba
commit 714d295
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 10 deletions.
diff --git a/...wallet/instance/app/src/main/java/com/tonapps/tonkeeper/client/safemode/SafeModeClient.kt b/...wallet/instance/app/src/main/java/com/tonapps/tonkeeper/client/safemode/SafeModeClient.kt
@@ -53,7 +53,7 @@ class SafeModeClient(
 
     fun isHasScamUris(vararg uris: Uri): Boolean {
         for (uri in uris) {
-            if (uri == Uri.EMPTY) {
+            if (uri == Uri.EMPTY || uri.scheme != "https") {
                 continue
             }
             var host = uri.host ?: continue

diff --git a/.../instance/app/src/main/java/com/tonapps/tonkeeper/manager/tonconnect/TonConnectManager.kt b/.../instance/app/src/main/java/com/tonapps/tonkeeper/manager/tonconnect/TonConnectManager.kt
@@ -238,12 +238,10 @@ class TonConnectManager(
                 fromPackageName = fromPackageName
             )
 
-            if (isScam(context, uri, normalizedUri, tonConnect.manifestUrl.toUri())) {
-                return null
-            }
-
             safeModeClient.isReadyFlow.take(1).onEach {
-                connectRemoteApp(activity, tonConnect)
+                if (!isScam(context, uri, normalizedUri, tonConnect.manifestUrl.toUri())) {
+                    connectRemoteApp(activity, tonConnect)
+                }
             }.launchIn(scope)
             return null
         } catch (e: Exception) {
@@ -275,6 +273,10 @@ class TonConnectManager(
         val clientId = tonConnect.clientId
         try {
             val app = readManifest(tonConnect.manifestUrl)
+            if (isScam(activity, app.iconUrl.toUri(), app.url)) {
+                return@withContext JsonBuilder.connectEventError(BridgeError.badRequest("client error"))
+            }
+
             val screen = TonConnectScreen.newInstance(
                 app = app,
                 proofPayload = tonConnect.proofPayload,
@@ -325,9 +327,11 @@ class TonConnectManager(
         }
     }
 
-    fun isScam(context: Context, vararg uris: Uri): Boolean {
+    suspend fun isScam(context: Context, vararg uris: Uri): Boolean {
         if (settingsRepository.isSafeModeEnabled() && safeModeClient.isHasScamUris(*uris)) {
-            TonConnectSafeModeDialog(context).show()
+            withContext(Dispatchers.Main) {
+                TonConnectSafeModeDialog(context).show()
+            }
             return true
         }
         return false

diff --git a/...let/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/browser/dapp/DAppScreen.kt b/...let/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/browser/dapp/DAppScreen.kt
@@ -4,6 +4,7 @@ import android.content.Intent
 import android.graphics.Bitmap
 import android.net.Uri
 import android.os.Bundle
+import android.util.Log
 import android.view.View
 import android.view.ViewGroup
 import android.webkit.WebResourceRequest

diff --git a/...pp/src/main/java/com/tonapps/tonkeeper/ui/screen/browser/search/BrowserSearchViewModel.kt b/...pp/src/main/java/com/tonapps/tonkeeper/ui/screen/browser/search/BrowserSearchViewModel.kt
@@ -2,6 +2,7 @@ package com.tonapps.tonkeeper.ui.screen.browser.search
 
 import android.app.Application
 import android.net.Uri
+import android.util.Log
 import com.tonapps.extensions.MutableEffectFlow
 import com.tonapps.network.get
 import com.tonapps.tonkeeper.ui.base.BaseWalletVM
@@ -72,6 +73,9 @@ class BrowserSearchViewModel(
         if (isDomain(query)) {
             return Uri.parse("https://$query")
         }
+        if (query.startsWith("http://")) {
+            return uri(query.replace("http://", "https://"))
+        }
         return try {
             val uri = Uri.parse(query)
             if (uri.scheme != "https") {

diff --git a/.../app/src/main/java/com/tonapps/tonkeeper/ui/screen/tonconnect/TonConnectSafeModeDialog.kt b/.../app/src/main/java/com/tonapps/tonkeeper/ui/screen/tonconnect/TonConnectSafeModeDialog.kt
@@ -6,7 +6,7 @@ import com.tonapps.tonkeeper.ui.screen.settings.security.SecurityScreen
 import com.tonapps.tonkeeperx.R
 import uikit.dialog.modal.ModalDialog
 import uikit.navigation.Navigation
-import uikit.widget.HeaderView
+import uikit.widget.ModalHeader
 
 class TonConnectSafeModeDialog(context: Context): ModalDialog(context, R.layout.dialog_tonconnect_safemode) {
 
@@ -15,7 +15,7 @@ class TonConnectSafeModeDialog(context: Context): ModalDialog(context, R.layout.
     }
 
     init {
-        findViewById<HeaderView>(R.id.header)!!.doOnCloseClick = { dismiss() }
+        findViewById<ModalHeader>(R.id.header)!!.onCloseClick = { dismiss() }
         findViewById<View>(R.id.open_settings)!!.setOnClickListener {
             dismiss()
             navigation?.add(SecurityScreen.newInstance())