summaryrefslogtreecommitdiff
path: root/wallet/src/main/java/net/taler/wallet
diff options
context:
space:
mode:
authorTorsten Grote <t@grobox.de>2020-09-01 09:54:21 -0300
committerTorsten Grote <t@grobox.de>2020-09-01 09:54:21 -0300
commitc59243c9bdabf07137ad0f070b6ecbde57e66466 (patch)
tree1599b6f112f6a96dc274bda816edf85eabf8facf /wallet/src/main/java/net/taler/wallet
parenta0b0ee2b13b72d1ec6a489150c717c8bfa863158 (diff)
downloadtaler-android-c59243c9bdabf07137ad0f070b6ecbde57e66466.tar.gz
taler-android-c59243c9bdabf07137ad0f070b6ecbde57e66466.tar.bz2
taler-android-c59243c9bdabf07137ad0f070b6ecbde57e66466.zip
[wallet] don't crash on serialization errors from wallet-core
This should not be necessary if we had a stable API with documentated and versioned changes, but well...
Diffstat (limited to 'wallet/src/main/java/net/taler/wallet')
-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)
}