From c928b458fce0c72c75852ab338a6e4e85a278ed4 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 1 Sep 2020 11:12:31 -0300
Subject: [wallet] support the new TalerErrorInfo error format

Yet another last-minute breaking protocol change.
---
 wallet/src/main/java/net/taler/wallet/payment/PaymentManager.kt   | 4 ++--
 wallet/src/main/java/net/taler/wallet/payment/PaymentResponses.kt | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'wallet/src/main/java/net/taler/wallet/payment')

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 befcd83..c364286 100644
--- a/wallet/src/main/java/net/taler/wallet/payment/PaymentManager.kt
+++ b/wallet/src/main/java/net/taler/wallet/payment/PaymentManager.kt
@@ -26,7 +26,7 @@ import net.taler.common.ContractTerms
 import net.taler.lib.common.Amount
 import net.taler.wallet.TAG
 import net.taler.wallet.backend.WalletBackendApi
-import net.taler.wallet.backend.WalletErrorInfo
+import net.taler.wallet.backend.TalerErrorInfo
 import net.taler.wallet.payment.PayStatus.AlreadyPaid
 import net.taler.wallet.payment.PayStatus.InsufficientBalance
 import net.taler.wallet.payment.PreparePayResponse.AlreadyConfirmedResponse
@@ -130,7 +130,7 @@ class PaymentManager(
         mPayStatus.value = PayStatus.None
     }
 
-    private fun handleError(operation: String, error: WalletErrorInfo) {
+    private fun handleError(operation: String, error: TalerErrorInfo) {
         Log.e(TAG, "got $operation error result $error")
         mPayStatus.value = PayStatus.Error(error.userFacingMsg)
     }
diff --git a/wallet/src/main/java/net/taler/wallet/payment/PaymentResponses.kt b/wallet/src/main/java/net/taler/wallet/payment/PaymentResponses.kt
index 2e99806..4b908b5 100644
--- a/wallet/src/main/java/net/taler/wallet/payment/PaymentResponses.kt
+++ b/wallet/src/main/java/net/taler/wallet/payment/PaymentResponses.kt
@@ -21,7 +21,7 @@ import kotlinx.serialization.Serializable
 import net.taler.common.ContractTerms
 import net.taler.lib.android.CustomClassDiscriminator
 import net.taler.lib.common.Amount
-import net.taler.wallet.transactions.TransactionError
+import net.taler.wallet.backend.TalerErrorInfo
 
 @Serializable
 sealed class PreparePayResponse {
@@ -75,5 +75,5 @@ sealed class ConfirmPayResult {
 
     @Serializable
     @SerialName("pending")
-    data class Pending(val lastError: TransactionError) : ConfirmPayResult()
+    data class Pending(val lastError: TalerErrorInfo) : ConfirmPayResult()
 }
-- 
cgit v1.2.3