diff options
author | Torsten Grote <t@grobox.de> | 2020-09-01 11:12:31 -0300 |
---|---|---|
committer | Torsten Grote <t@grobox.de> | 2020-09-01 11:13:17 -0300 |
commit | c928b458fce0c72c75852ab338a6e4e85a278ed4 (patch) | |
tree | 02f70b9be6ca1cc5cb30ad41631bac92d9f49ed0 /wallet/src/main/java/net/taler/wallet/backend/WalletBackendApi.kt | |
parent | c59243c9bdabf07137ad0f070b6ecbde57e66466 (diff) | |
download | taler-android-c928b458fce0c72c75852ab338a6e4e85a278ed4.tar.gz taler-android-c928b458fce0c72c75852ab338a6e4e85a278ed4.tar.bz2 taler-android-c928b458fce0c72c75852ab338a6e4e85a278ed4.zip |
[wallet] support the new TalerErrorInfo error format
Yet another last-minute breaking protocol change.
Diffstat (limited to 'wallet/src/main/java/net/taler/wallet/backend/WalletBackendApi.kt')
-rw-r--r-- | wallet/src/main/java/net/taler/wallet/backend/WalletBackendApi.kt | 18 |
1 files changed, 9 insertions, 9 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 a72df9c..a2b48b6 100644 --- a/wallet/src/main/java/net/taler/wallet/backend/WalletBackendApi.kt +++ b/wallet/src/main/java/net/taler/wallet/backend/WalletBackendApi.kt @@ -157,20 +157,20 @@ class WalletBackendApi( } } sendRequest(operation, args?.invoke(JSONObject())) { isError, message -> - val response = if (isError) { - val error = - json.decodeFromString(WalletErrorInfo.serializer(), message.toString()) - WalletResponse.Error(error) - } else { - try { + val response = try { + if (isError) { + val error = + json.decodeFromString(TalerErrorInfo.serializer(), message.toString()) + WalletResponse.Error(error) + } else { 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) } + } catch (e: Exception) { + val info = TalerErrorInfo(0, "", e.toString(), null) + WalletResponse.Error(info) } cont.resume(response) } |