summaryrefslogtreecommitdiff
path: root/wallet/src/main/java/net/taler/wallet/backend
diff options
context:
space:
mode:
Diffstat (limited to 'wallet/src/main/java/net/taler/wallet/backend')
-rw-r--r--wallet/src/main/java/net/taler/wallet/backend/WalletBackendApi.kt15
1 files changed, 11 insertions, 4 deletions
diff --git a/wallet/src/main/java/net/taler/wallet/backend/WalletBackendApi.kt b/wallet/src/main/java/net/taler/wallet/backend/WalletBackendApi.kt
index c6261bf..a72df9c 100644
--- a/wallet/src/main/java/net/taler/wallet/backend/WalletBackendApi.kt
+++ b/wallet/src/main/java/net/taler/wallet/backend/WalletBackendApi.kt
@@ -158,12 +158,19 @@ class WalletBackendApi(
}
sendRequest(operation, args?.invoke(JSONObject())) { isError, message ->
val response = if (isError) {
- val error = json.decodeFromString(WalletErrorInfo.serializer(), message.toString())
+ val error =
+ json.decodeFromString(WalletErrorInfo.serializer(), message.toString())
WalletResponse.Error(error)
} else {
- @Suppress("UNCHECKED_CAST") // if serializer is null, T must be Unit
- val t: T = serializer?.let { json.decodeFromString(serializer, message.toString()) } ?: Unit as T
- WalletResponse.Success(t)
+ try {
+ val t: T = serializer?.let {
+ json.decodeFromString(serializer, message.toString())
+ } ?: Unit as T
+ WalletResponse.Success(t)
+ } catch (e: Exception) {
+ val info = WalletErrorInfo(0, "", e.toString(), null)
+ WalletResponse.Error(info)
+ }
}
cont.resume(response)
}