fix set result crash

tonkeeper · Oct 31, 2024 · 8d7838e · 8d7838e
1 parent 2b1d1f1
commit 8d7838e
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 7 deletions.
diff --git a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/API.kt b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/API.kt
@@ -481,8 +481,8 @@ class API(
         }
     }
 
-    fun batteryVerifyPurchasePromo(testnet: Boolean, code: String): Boolean {
-        return withRetry {
+    suspend fun batteryVerifyPurchasePromo(testnet: Boolean, code: String): Boolean = withContext(Dispatchers.IO) {
+        withRetry {
             battery(testnet).verifyPurchasePromo(code)
             true
         } ?: false

diff --git a/...et/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/refill/list/Item.kt b/...et/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/refill/list/Item.kt
@@ -73,7 +73,7 @@ sealed class Item(type: Int) : BaseListItem(type) {
             get() = promoState is PromoState.Error
 
         val promoCode: String?
-            get() = appliedPromo ?: code
+            get() = code ?: appliedPromo
     }
 
     data class Settings(

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
@@ -507,7 +507,19 @@ class RootViewModel(
     }
 
     private suspend fun openBattery(wallet: WalletEntity, route: DeepLinkRoute.Battery) {
-        openScreen(BatteryScreen.newInstance(wallet, route.promocode))
+        val promoCode = route.promocode
+        if (promoCode.isNullOrEmpty()) {
+            openScreen(BatteryScreen.newInstance(wallet))
+        } else {
+            loading(true)
+            val validCode = api.batteryVerifyPurchasePromo(wallet.testnet, promoCode)
+            loading(false)
+            if (validCode) {
+                openScreen(BatteryScreen.newInstance(wallet, promoCode))
+            } else {
+                toast(Localization.wrong_promocode)
+            }
+        }
     }
 
     private suspend fun openTokenViewer(wallet: WalletEntity, route: DeepLinkRoute.Jetton) {

diff --git a/...p/src/main/java/com/tonapps/tonkeeper/ui/screen/send/transaction/SendTransactionScreen.kt b/...p/src/main/java/com/tonapps/tonkeeper/ui/screen/send/transaction/SendTransactionScreen.kt
@@ -8,6 +8,7 @@ import androidx.appcompat.widget.AppCompatTextView
 import androidx.core.view.doOnNextLayout
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.RecyclerView
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.tonapps.extensions.getParcelableCompat
 import com.tonapps.tonkeeper.core.history.list.HistoryAdapter
 import com.tonapps.tonkeeper.extensions.getTitle
@@ -152,9 +153,13 @@ class SendTransactionScreen(wallet: WalletEntity) : WalletContextScreen(R.layout
     }
 
     private fun setErrorResult(error: BridgeException) {
-        setResult(Bundle().apply {
-            putParcelable(ERROR, error)
-        })
+        try {
+            setResult(Bundle().apply {
+                putParcelable(ERROR, error)
+            })
+        } catch (e: Throwable) {
+            FirebaseCrashlytics.getInstance().recordException(Throwable("Error: $error\nAppUrl: ${args.request.appUri}", e))
+        }
     }
 
     private fun setSuccessTask(boc: String) {

diff --git a/apps/wallet/localization/src/main/res/values-ru/strings.xml b/apps/wallet/localization/src/main/res/values-ru/strings.xml
@@ -227,6 +227,7 @@
     <string name="disconnect_all_apps_confirm">Отключить все приложения?</string>
     <string name="connected_apps_empty">Нет подключённых приложений</string>
     <string name="send_all_balance">Вы уверены, что хотите отправить весь свой баланс?</string>
+    <string name="wrong_promocode">Введённый промокод недействителен</string>
 
 
 

diff --git a/apps/wallet/localization/src/main/res/values/strings.xml b/apps/wallet/localization/src/main/res/values/strings.xml
@@ -543,4 +543,5 @@
     <string name="disconnect_all_apps_confirm">Disconnect All Apps?</string>
     <string name="connected_apps_empty">No connected apps</string>
     <string name="send_all_balance">Are you sure you want to send all your balance?</string>
+    <string name="wrong_promocode">The entered code is not valid</string>
 </resources>