From e6229b300ab59d3db0b628f3a0b0eea304f1921b Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 13 Apr 2020 15:29:29 -0300
Subject: [wallet] adapt to latest API breaking changes of wallet-core

---
 .../src/main/java/net/taler/wallet/history/HistoryAdapter.kt  |  2 +-
 wallet/src/main/java/net/taler/wallet/history/HistoryEvent.kt | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'wallet/src/main/java')

diff --git a/wallet/src/main/java/net/taler/wallet/history/HistoryAdapter.kt b/wallet/src/main/java/net/taler/wallet/history/HistoryAdapter.kt
index ede55df..b9770fb 100644
--- a/wallet/src/main/java/net/taler/wallet/history/HistoryAdapter.kt
+++ b/wallet/src/main/java/net/taler/wallet/history/HistoryAdapter.kt
@@ -99,7 +99,7 @@ internal class HistoryAdapter(
             info.text = when (event) {
                 is ExchangeAddedEvent -> cleanExchange(event.exchangeBaseUrl)
                 is ExchangeUpdatedEvent -> cleanExchange(event.exchangeBaseUrl)
-                is ReserveBalanceUpdatedEvent -> event.amountReserveBalance.toString()
+                is ReserveBalanceUpdatedEvent -> event.reserveBalance.toString()
                 is HistoryPaymentSentEvent -> event.orderShortInfo.summary
                 is HistoryOrderAcceptedEvent -> event.orderShortInfo.summary
                 is HistoryOrderRefusedEvent -> event.orderShortInfo.summary
diff --git a/wallet/src/main/java/net/taler/wallet/history/HistoryEvent.kt b/wallet/src/main/java/net/taler/wallet/history/HistoryEvent.kt
index 50a973f..af017ed 100644
--- a/wallet/src/main/java/net/taler/wallet/history/HistoryEvent.kt
+++ b/wallet/src/main/java/net/taler/wallet/history/HistoryEvent.kt
@@ -175,7 +175,6 @@ class ExchangeUpdatedEvent(
 @JsonTypeName("reserve-balance-updated")
 class ReserveBalanceUpdatedEvent(
     timestamp: Timestamp,
-    val newHistoryTransactions: List<ReserveTransaction>,
     /**
      * Condensed information about the reserve.
      */
@@ -183,12 +182,16 @@ class ReserveBalanceUpdatedEvent(
     /**
      * Amount currently left in the reserve.
      */
-    val amountReserveBalance: Amount,
+    val reserveBalance: Amount,
     /**
      * Amount we expected to be in the reserve at that time,
      * considering ongoing withdrawals from that reserve.
      */
-    val amountExpected: Amount
+    val reserveAwaitedAmount: Amount,
+    /**
+     * Amount that hasn't been withdrawn yet.
+     */
+    val reserveUnclaimedAmount: Amount
 ) : HistoryEvent(timestamp) {
     override val title = R.string.history_event_reserve_balance_updated
 }
@@ -204,7 +207,7 @@ class HistoryWithdrawnEvent(
      * Unique identifier for the withdrawal session, can be used to
      * query more detailed information from the wallet.
      */
-    val withdrawSessionId: String,
+    val withdrawalGroupId: String,
     val withdrawalSource: WithdrawalSource,
     /**
      * Amount that has been subtracted from the reserve's balance
-- 
cgit v1.2.3