fix for browser

tonkeeper · Dec 3, 2024 · 979ab7e · 979ab7e
1 parent 6b8007b
commit 979ab7e
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 12 deletions.
diff --git a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/internal/InternalApi.kt b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/internal/InternalApi.kt
@@ -39,6 +39,7 @@ internal class InternalApi(
             .appendQueryParameter("build", build)
             .appendQueryParameter("platform", platform)
             .appendQueryParameter("chainName", if (testnet) "testnet" else "mainnet")
+
         return builder.build().toString()
     }
 

diff --git a/apps/wallet/data/browser/src/main/java/com/tonapps/wallet/data/browser/BrowserRepository.kt b/apps/wallet/data/browser/src/main/java/com/tonapps/wallet/data/browser/BrowserRepository.kt
@@ -44,7 +44,7 @@ class BrowserRepository(context: Context, api: API) {
         locale: Locale
     ) = flow {
         loadLocal(country, locale)?.let { emit(it) }
-        load(country, testnet, locale)?.let { emit(it) }
+        loadRemote(country, testnet, locale)?.let { emit(it) }
     }
 
     suspend fun load(country: String, testnet: Boolean, locale: Locale): BrowserDataEntity? = withContext(Dispatchers.IO) {

diff --git a/...t/data/browser/src/main/java/com/tonapps/wallet/data/browser/entities/BrowserAppEntity.kt b/...t/data/browser/src/main/java/com/tonapps/wallet/data/browser/entities/BrowserAppEntity.kt
@@ -3,6 +3,7 @@ package com.tonapps.wallet.data.browser.entities
 import android.graphics.Color
 import android.net.Uri
 import android.os.Parcelable
+import com.tonapps.extensions.toUriOrNull
 import kotlinx.parcelize.Parcelize
 import org.json.JSONArray
 import org.json.JSONObject
@@ -37,7 +38,7 @@ data class BrowserAppEntity(
         description = json.getString("description"),
         icon = Uri.parse(json.getString("icon")),
         poster = json.optString("poster")?.let { Uri.parse(it) },
-        url = Uri.parse(json.getString("url")),
+        url = json.optString("url").toUriOrNull() ?: Uri.EMPTY,
         textColor = Color.parseColor(json.optString("textColor", "#ffffff")),
         button = json.optJSONObject("button")?.let { Button(it) }
     )

diff --git a/.../data/browser/src/main/java/com/tonapps/wallet/data/browser/entities/BrowserDataEntity.kt b/.../data/browser/src/main/java/com/tonapps/wallet/data/browser/entities/BrowserDataEntity.kt
@@ -1,6 +1,7 @@
 package com.tonapps.wallet.data.browser.entities
 
 import android.os.Parcelable
+import android.util.Log
 import kotlinx.parcelize.Parcelize
 import org.json.JSONObject
 

diff --git a/...let/data/browser/src/main/java/com/tonapps/wallet/data/browser/source/RemoteDataSource.kt b/...let/data/browser/src/main/java/com/tonapps/wallet/data/browser/source/RemoteDataSource.kt
@@ -1,5 +1,6 @@
 package com.tonapps.wallet.data.browser.source
 
+import android.util.Log
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.tonapps.wallet.api.API
 import com.tonapps.wallet.data.browser.entities.BrowserDataEntity

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
@@ -294,16 +294,18 @@ class TonConnectManager(
 
         val clientId = tonConnect.clientId
         try {
+            val targetWallet = if (wallet != null && wallet.isTonConnectSupported) wallet else null
+
             val app = readManifest(tonConnect.manifestUrl)
-            if (isScam(activity, wallet ?: WalletEntity.EMPTY, app.iconUrl.toUri(), app.url)) {
+            if (isScam(activity, targetWallet ?: WalletEntity.EMPTY, app.iconUrl.toUri(), app.url)) {
                 return@withContext JsonBuilder.connectEventError(BridgeError.badRequest("client error"))
             }
 
             val screen = TonConnectScreen.newInstance(
                 app = app,
                 proofPayload = tonConnect.proofPayload,
                 returnUri = tonConnect.returnUri,
-                wallet = wallet,
+                wallet = targetWallet,
                 fromPackageName = tonConnect.fromPackageName
             )
             val bundle = activity.addForResult(screen)

diff --git a/...tance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/browser/main/BrowserMainScreen.kt b/...tance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/browser/main/BrowserMainScreen.kt
@@ -110,7 +110,7 @@ class BrowserMainScreen(wallet: WalletEntity): WalletContextScreen(R.layout.frag
                 spanSizeLookup = object : SpanSizeLookup() {
                     override fun getSpanSize(position: Int): Int {
                         return when (exploreAdapter.getItemViewType(position)) {
-                            ExploreItem.TYPE_TITLE, ExploreItem.TYPE_BANNERS -> 4
+                            ExploreItem.TYPE_TITLE, ExploreItem.TYPE_BANNERS, ExploreItem.TYPE_ADS -> 4
                             else -> 1
                         }
                     }

diff --git a/...ce/app/src/main/java/com/tonapps/tonkeeper/ui/screen/browser/main/BrowserMainViewModel.kt b/...ce/app/src/main/java/com/tonapps/tonkeeper/ui/screen/browser/main/BrowserMainViewModel.kt
@@ -1,6 +1,7 @@
 package com.tonapps.tonkeeper.ui.screen.browser.main
 
 import android.app.Application
+import android.util.Log
 import androidx.lifecycle.viewModelScope
 import com.tonapps.extensions.MutableEffectFlow
 import com.tonapps.extensions.mapList

diff --git a/...ps/tonkeeper/ui/screen/browser/main/list/explore/list/holder/ExploreTitleExploreHolder.kt b/...ps/tonkeeper/ui/screen/browser/main/list/explore/list/holder/ExploreTitleExploreHolder.kt
@@ -11,11 +11,11 @@ class ExploreTitleExploreHolder(
 ): ExploreHolder<ExploreItem.Title>(parent, R.layout.view_browser_title) {
 
     private val titleView = findViewById<AppCompatTextView>(R.id.title)
-    private val allView = findViewById<AppCompatTextView>(R.id.all)
+    // private val allView = findViewById<AppCompatTextView>(R.id.all)
 
     override fun onBind(item: ExploreItem.Title) {
         titleView.text = item.title
-        allView.setOnClickListener {
+        itemView.setOnClickListener {
             onMoreClick(item.id)
         }
     }

diff --git a/...ce/app/src/main/java/com/tonapps/tonkeeper/ui/screen/browser/more/BrowserMoreViewModel.kt b/...ce/app/src/main/java/com/tonapps/tonkeeper/ui/screen/browser/more/BrowserMoreViewModel.kt
@@ -12,7 +12,6 @@ import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
-import uikit.extensions.collectFlow
 
 class BrowserMoreViewModel(
     application: Application,

diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/root/RootViewModel.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/root/RootViewModel.kt
@@ -53,6 +53,7 @@ import com.tonapps.tonkeeper.manager.tonconnect.TonConnectManager
 import com.tonapps.tonkeeper.manager.tonconnect.bridge.model.BridgeError
 import com.tonapps.tonkeeper.ui.base.BaseWalletVM
 import com.tonapps.tonkeeper.ui.component.UpdateAvailableDialog
+import com.tonapps.tonkeeper.ui.screen.add.AddWalletScreen
 import com.tonapps.tonkeeper.ui.screen.backup.main.BackupScreen
 import com.tonapps.tonkeeper.ui.screen.battery.BatteryScreen
 import com.tonapps.tonkeeper.ui.screen.browser.dapp.DAppScreen
@@ -486,7 +487,11 @@ class RootViewModel(
 
     private suspend fun processDeepLink(wallet: WalletEntity, deeplink: DeepLink, fromPackageName: String?) {
         val route = deeplink.route
-        if (route is DeepLinkRoute.TonConnect && !wallet.isWatchOnly) {
+        if (route is DeepLinkRoute.TonConnect) {
+            if (!wallet.isTonConnectSupported && accountRepository.getWallets().count { it.isTonConnectSupported } == 0) {
+                openScreen(AddWalletScreen.newInstance(true))
+                return
+            }
             processTonConnectDeepLink(deeplink, fromPackageName)
         } else if (route is DeepLinkRoute.Story) {
             showStory(route.id, "deep-link")

diff --git a/apps/wallet/instance/app/src/main/res/layout/view_browser_ads.xml b/apps/wallet/instance/app/src/main/res/layout/view_browser_ads.xml
@@ -3,20 +3,24 @@
     android:layout_width="match_parent"
     android:layout_height="76dp"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:padding="@dimen/offsetMedium">
+    android:padding="@dimen/offsetMedium"
+    android:layout_marginHorizontal="@dimen/offsetMedium"
+    android:layout_marginBottom="@dimen/offsetMedium"
+    android:background="@drawable/bg_content">
 
     <uikit.widget.FrescoView
         android:id="@+id/icon"
         android:layout_width="44dp"
         android:layout_height="44dp"
+        android:layout_gravity="center"
         app:roundedCornerRadius="12dp"/>
 
     <uikit.widget.ColumnLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:layout_gravity="center"
-        android:padding="@dimen/offsetMedium">
+        android:paddingHorizontal="@dimen/offsetMedium">
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/title"
@@ -43,8 +47,9 @@
         android:layout_height="36dp"
         android:layout_gravity="center"
         android:text="@string/open"
+        android:backgroundTint="?attr/backgroundContentTintColor"
         android:textAppearance="@style/TextAppearance.Label2"
         android:paddingVertical="0dp"
-        android:paddingHorizontal="16dp"/>
+        android:paddingHorizontal="8dp"/>
 
 </uikit.widget.RowLayout>