From b1acd03f70a33f069a321c6755943421330d2d8d Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Wed, 5 Aug 2020 14:31:10 -0300 Subject: [wallet] show more user-friendly error messages for operations --- wallet/src/main/java/net/taler/wallet/payment/PaymentManager.kt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'wallet/src/main/java/net/taler/wallet/payment/PaymentManager.kt') diff --git a/wallet/src/main/java/net/taler/wallet/payment/PaymentManager.kt b/wallet/src/main/java/net/taler/wallet/payment/PaymentManager.kt index 2427afb..db21da4 100644 --- a/wallet/src/main/java/net/taler/wallet/payment/PaymentManager.kt +++ b/wallet/src/main/java/net/taler/wallet/payment/PaymentManager.kt @@ -26,6 +26,7 @@ import net.taler.common.Amount import net.taler.common.ContractTerms import net.taler.wallet.TAG import net.taler.wallet.backend.WalletBackendApi +import net.taler.wallet.getErrorString import net.taler.wallet.payment.PayStatus.AlreadyPaid import net.taler.wallet.payment.PayStatus.InsufficientBalance import net.taler.wallet.payment.PreparePayResponse.AlreadyConfirmedResponse @@ -71,7 +72,7 @@ class PaymentManager( val args = JSONObject(mapOf("talerPayUri" to url)) walletBackendApi.sendRequest("preparePay", args) { isError, result -> if (isError) { - handleError("preparePay", result.toString(2)) + handleError("preparePay", getErrorString(result)) return@sendRequest } val response: PreparePayResponse = mapper.readValue(result.toString()) @@ -84,6 +85,7 @@ class PaymentManager( } } + // TODO validate product images (or leave to wallet-core?) private fun getContractTerms(json: JSONObject): ContractTerms { val terms: ContractTerms = mapper.readValue(json.getString("contractTermsRaw")) // validate product images @@ -101,7 +103,7 @@ class PaymentManager( val args = JSONObject(mapOf("proposalId" to proposalId)) walletBackendApi.sendRequest("confirmPay", args) { isError, result -> if (isError) { - handleError("preparePay", result.toString()) + handleError("preparePay", getErrorString(result)) return@sendRequest } mPayStatus.postValue(PayStatus.Success(currency)) @@ -124,7 +126,7 @@ class PaymentManager( walletBackendApi.sendRequest("abortProposal", args) { isError, result -> if (isError) { - handleError("abortProposal", result.toString(2)) + handleError("abortProposal", getErrorString(result)) Log.e(TAG, "received error response to abortProposal") return@sendRequest } -- cgit v1.2.3