summaryrefslogtreecommitdiff
path: root/wallet/src/main/java/net/taler/wallet/transactions
diff options
context:
space:
mode:
authorTorsten Grote <t@grobox.de>2020-08-05 14:31:10 -0300
committerTorsten Grote <t@grobox.de>2020-08-05 14:31:10 -0300
commitb1acd03f70a33f069a321c6755943421330d2d8d (patch)
tree44a4775ab769a8686e16338c1a7eeefe704d8e14 /wallet/src/main/java/net/taler/wallet/transactions
parent35f7ed512ed7445362d6caee1bf60441f4ce979e (diff)
downloadtaler-android-b1acd03f70a33f069a321c6755943421330d2d8d.tar.gz
taler-android-b1acd03f70a33f069a321c6755943421330d2d8d.tar.bz2
taler-android-b1acd03f70a33f069a321c6755943421330d2d8d.zip
[wallet] show more user-friendly error messages for operations
Diffstat (limited to 'wallet/src/main/java/net/taler/wallet/transactions')
-rw-r--r--wallet/src/main/java/net/taler/wallet/transactions/TransactionManager.kt5
-rw-r--r--wallet/src/main/java/net/taler/wallet/transactions/TransactionsFragment.kt4
2 files changed, 5 insertions, 4 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 bd37b37..8ec3914 100644
--- a/wallet/src/main/java/net/taler/wallet/transactions/TransactionManager.kt
+++ b/wallet/src/main/java/net/taler/wallet/transactions/TransactionManager.kt
@@ -27,12 +27,13 @@ import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import net.taler.wallet.backend.WalletBackendApi
+import net.taler.wallet.getErrorString
import org.json.JSONObject
import java.util.HashMap
import java.util.LinkedList
sealed class TransactionsResult {
- object Error : TransactionsResult()
+ class Error(val msg: String) : TransactionsResult()
class Success(val transactions: List<Transaction>) : TransactionsResult()
}
@@ -72,7 +73,7 @@ class TransactionManager(
searchQuery?.let { request.put("search", it) }
walletBackendApi.sendRequest("getTransactions", request) { isError, result ->
if (isError) {
- liveData.postValue(TransactionsResult.Error)
+ liveData.postValue(TransactionsResult.Error(getErrorString(result)))
mProgress.postValue(false)
} else {
val currencyToUpdate = if (searchQuery == null) currency else null
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 2ae58c3..8d47a3f 100644
--- a/wallet/src/main/java/net/taler/wallet/transactions/TransactionsFragment.kt
+++ b/wallet/src/main/java/net/taler/wallet/transactions/TransactionsFragment.kt
@@ -160,9 +160,9 @@ class TransactionsFragment : Fragment(), OnTransactionClickListener, ActionMode.
}
private fun onTransactionsResult(result: TransactionsResult) = when (result) {
- TransactionsResult.Error -> {
+ is TransactionsResult.Error -> {
list.fadeOut()
- emptyState.text = getString(R.string.transactions_error)
+ emptyState.text = getString(R.string.transactions_error, result.msg)
emptyState.fadeIn()
}
is TransactionsResult.Success -> {