From 038673c5ddb97c4b02fe0064758f6301ffcc2a6f Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 12 Aug 2020 13:23:31 -0300
Subject: [wallet] adapt to new Refund API

---
 .../net/taler/wallet/transactions/TransactionDetailFragment.kt     | 7 +++++--
 .../main/java/net/taler/wallet/transactions/TransactionManager.kt  | 2 +-
 wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt | 7 ++++++-
 3 files changed, 12 insertions(+), 4 deletions(-)

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

diff --git a/wallet/src/main/java/net/taler/wallet/transactions/TransactionDetailFragment.kt b/wallet/src/main/java/net/taler/wallet/transactions/TransactionDetailFragment.kt
index 0142978..be83b09 100644
--- a/wallet/src/main/java/net/taler/wallet/transactions/TransactionDetailFragment.kt
+++ b/wallet/src/main/java/net/taler/wallet/transactions/TransactionDetailFragment.kt
@@ -55,7 +55,8 @@ class TransactionDetailFragment : Fragment() {
     }
 
     override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
+        inflater: LayoutInflater,
+        container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
         return inflater.inflate(transaction.detailPageLayout, container, false)
@@ -96,7 +97,9 @@ class TransactionDetailFragment : Fragment() {
     private fun bind(t: TransactionWithdrawal) {
         effectiveAmountLabel.text = getString(R.string.withdraw_total)
         effectiveAmountView.text = t.amountEffective.toString()
-        if (t.pending && t.withdrawalDetails is TalerBankIntegrationApi && !t.confirmed && t.withdrawalDetails.bankConfirmationUrl != null) {
+        if (t.pending && t.withdrawalDetails is TalerBankIntegrationApi &&
+            !t.confirmed && t.withdrawalDetails.bankConfirmationUrl != null
+        ) {
             val i = Intent().apply {
                 data = Uri.parse(t.withdrawalDetails.bankConfirmationUrl)
             }
diff --git a/wallet/src/main/java/net/taler/wallet/transactions/TransactionManager.kt b/wallet/src/main/java/net/taler/wallet/transactions/TransactionManager.kt
index b9f86b3..d398f57 100644
--- a/wallet/src/main/java/net/taler/wallet/transactions/TransactionManager.kt
+++ b/wallet/src/main/java/net/taler/wallet/transactions/TransactionManager.kt
@@ -94,7 +94,7 @@ class TransactionManager(
         val transactions: LinkedList<Transaction> = mapper.readValue(transactionsArray)
         // TODO remove when fixed in wallet-core
         transactions.sortWith(compareBy({ it.pending }, { it.timestamp.ms }, { it.transactionId }))
-        transactions.reverse()  // show latest first
+        transactions.reverse() // show latest first
         mProgress.postValue(false)
         liveData.postValue(TransactionsResult.Success(transactions))
         // update all transactions on UiThread if there was a currency
diff --git a/wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt b/wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt
index 1ba7e79..08f02fc 100644
--- a/wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt
+++ b/wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt
@@ -188,9 +188,14 @@ class TransactionRefund(
     pending: Boolean,
     val refundedTransactionId: String,
     val info: TransactionInfo,
-    val amountInvalid: Amount,
+    /**
+     * Part of the refund that couldn't be applied because the refund permissions were expired
+     */
+    val amountInvalid: Amount? = null,
     error: TransactionError? = null,
+    @JsonProperty("amountEffective") // TODO remove when fixed in wallet-core
     amountRaw: Amount,
+    @JsonProperty("amountRaw") // TODO remove when fixed in wallet-core
     amountEffective: Amount
 ) : Transaction(transactionId, timestamp, pending, error, amountRaw, amountEffective) {
     override val icon = R.drawable.transaction_refund
-- 
cgit v1.2.3