diff options
author | Iván Ávalos <avalos@disroot.org> | 2023-04-28 23:03:38 -0600 |
---|---|---|
committer | Torsten Grote <t@grobox.de> | 2023-06-28 09:01:10 -0300 |
commit | 43c30b4482b68a8b5073afec66b68b07b30be436 (patch) | |
tree | 8a7ec1d82dcf6c42d84e6304dbcb4f71208305d9 /wallet/src/main/java/net/taler/wallet/transactions | |
parent | 2e255f70a501043307e3f14e89755e979a0d5d4c (diff) | |
download | taler-android-43c30b4482b68a8b5073afec66b68b07b30be436.tar.gz taler-android-43c30b4482b68a8b5073afec66b68b07b30be436.tar.bz2 taler-android-43c30b4482b68a8b5073afec66b68b07b30be436.zip |
[wallet] Show errors as JSON
bug 0007606
Diffstat (limited to 'wallet/src/main/java/net/taler/wallet/transactions')
-rw-r--r-- | wallet/src/main/java/net/taler/wallet/transactions/TransactionManager.kt | 5 | ||||
-rw-r--r-- | wallet/src/main/java/net/taler/wallet/transactions/TransactionsFragment.kt | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/wallet/src/main/java/net/taler/wallet/transactions/TransactionManager.kt b/wallet/src/main/java/net/taler/wallet/transactions/TransactionManager.kt index fcc7787..ed4c4da 100644 --- a/wallet/src/main/java/net/taler/wallet/transactions/TransactionManager.kt +++ b/wallet/src/main/java/net/taler/wallet/transactions/TransactionManager.kt @@ -24,12 +24,13 @@ import androidx.lifecycle.switchMap import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch import net.taler.wallet.TAG +import net.taler.wallet.backend.TalerErrorInfo import net.taler.wallet.backend.WalletBackendApi import net.taler.wallet.transactions.ExtendedStatus.Pending import java.util.LinkedList sealed class TransactionsResult { - class Error(val msg: String) : TransactionsResult() + class Error(val error: TalerErrorInfo) : TransactionsResult() class Success(val transactions: List<Transaction>) : TransactionsResult() } @@ -72,7 +73,7 @@ class TransactionManager( if (searchQuery != null) put("search", searchQuery) put("currency", currency) }.onError { - liveData.postValue(TransactionsResult.Error(it.userFacingMsg)) + liveData.postValue(TransactionsResult.Error(it)) mProgress.postValue(false) }.onSuccess { result -> val transactions = LinkedList(result.transactions) 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 5dff704..bc3c722 100644 --- a/wallet/src/main/java/net/taler/wallet/transactions/TransactionsFragment.kt +++ b/wallet/src/main/java/net/taler/wallet/transactions/TransactionsFragment.kt @@ -198,7 +198,7 @@ class TransactionsFragment : Fragment(), OnTransactionClickListener, ActionMode. private fun onTransactionsResult(result: TransactionsResult) = when (result) { is TransactionsResult.Error -> { ui.list.fadeOut() - ui.emptyState.text = getString(R.string.transactions_error, result.msg) + ui.emptyState.text = getString(R.string.transactions_error, result.error.userFacingMsg) ui.emptyState.fadeIn() } is TransactionsResult.Success -> { |