From 0574cad9c5cdfef4775af5cbd5d9d6e5d588f2ce Mon Sep 17 00:00:00 2001
From: Iván Ávalos <avalos@disroot.org>
Date: Thu, 29 Feb 2024 22:11:30 -0600
Subject:     [wallet] Don't show JSON errors to non-devs

    bug 0008549
---
 .../transactions/TransactionDetailFragment.kt      | 37 ++++++++++++++++++----
 .../wallet/transactions/TransactionsFragment.kt    |  7 +++-
 2 files changed, 37 insertions(+), 7 deletions(-)

(limited to 'wallet/src/main/java/net/taler/wallet/transactions')

diff --git a/wallet/src/main/java/net/taler/wallet/transactions/TransactionDetailFragment.kt b/wallet/src/main/java/net/taler/wallet/transactions/TransactionDetailFragment.kt
index d799b8e..78b728a 100644
--- a/wallet/src/main/java/net/taler/wallet/transactions/TransactionDetailFragment.kt
+++ b/wallet/src/main/java/net/taler/wallet/transactions/TransactionDetailFragment.kt
@@ -23,6 +23,7 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import net.taler.common.showError
 import net.taler.wallet.MainViewModel
 import net.taler.wallet.R
 import net.taler.wallet.TAG
@@ -98,7 +99,11 @@ abstract class TransactionDetailFragment : Fragment() {
     private fun deleteTransaction(t: Transaction) {
         transactionManager.deleteTransaction(t.transactionId) {
             Log.e(TAG, "Error deleteTransaction $it")
-            showError(it)
+            if (model.devMode.value == true) {
+                showError(it)
+            } else {
+                showError(it.userFacingMsg)
+            }
         }
         findNavController().popBackStack()
     }
@@ -106,35 +111,55 @@ abstract class TransactionDetailFragment : Fragment() {
     private fun retryTransaction(t: Transaction) {
         transactionManager.retryTransaction(t.transactionId) {
             Log.e(TAG, "Error retryTransaction $it")
-            showError(it)
+            if (model.devMode.value == true) {
+                showError(it)
+            } else {
+                showError(it.userFacingMsg)
+            }
         }
     }
 
     private fun abortTransaction(t: Transaction) {
         transactionManager.abortTransaction(t.transactionId) {
             Log.e(TAG, "Error abortTransaction $it")
-            showError(it)
+            if (model.devMode.value == true) {
+                showError(it)
+            } else {
+                showError(it.userFacingMsg)
+            }
         }
     }
 
     private fun failTransaction(t: Transaction) {
         transactionManager.failTransaction(t.transactionId) {
             Log.e(TAG, "Error failTransaction $it")
-            showError(it)
+            if (model.devMode.value == true) {
+                showError(it)
+            } else {
+                showError(it.userFacingMsg)
+            }
         }
     }
 
     private fun suspendTransaction(t: Transaction) {
         transactionManager.suspendTransaction(t.transactionId) {
             Log.e(TAG, "Error suspendTransaction $it")
-            showError(it)
+            if (model.devMode.value == true) {
+                showError(it)
+            } else {
+                showError(it.userFacingMsg)
+            }
         }
     }
 
     private fun resumeTransaction(t: Transaction) {
         transactionManager.resumeTransaction(t.transactionId) {
             Log.e(TAG, "Error resumeTransaction $it")
-            showError(it)
+            if (model.devMode.value == true) {
+                showError(it)
+            } else {
+                showError(it.userFacingMsg)
+            }
         }
     }
 }
diff --git a/wallet/src/main/java/net/taler/wallet/transactions/TransactionsFragment.kt b/wallet/src/main/java/net/taler/wallet/transactions/TransactionsFragment.kt
index b898bec..3f610d3 100644
--- a/wallet/src/main/java/net/taler/wallet/transactions/TransactionsFragment.kt
+++ b/wallet/src/main/java/net/taler/wallet/transactions/TransactionsFragment.kt
@@ -40,6 +40,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import net.taler.common.Amount
 import net.taler.common.fadeIn
 import net.taler.common.fadeOut
+import net.taler.common.showError
 import net.taler.wallet.MainViewModel
 import net.taler.wallet.R
 import net.taler.wallet.TAG
@@ -240,7 +241,11 @@ class TransactionsFragment : Fragment(), OnTransactionClickListener, ActionMode.
                         .setNegativeButton(R.string.transactions_delete) { dialog, _ ->
                             transactionManager.deleteTransactions(transactionIds) {
                                 Log.e(TAG, "Error deleteTransaction $it")
-                                showError(it)
+                                if (model.devMode.value == true) {
+                                    showError(it)
+                                } else {
+                                    showError(it.userFacingMsg)
+                                }
                             }
                             dialog.dismiss()
                         }
-- 
cgit v1.2.3