1 files changed, 32 insertions, 40 deletions

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 549b2a8..850a3bb 100644
--- a/wallet/src/main/java/net/taler/wallet/transactions/TransactionManager.kt
+++ b/wallet/src/main/java/net/taler/wallet/transactions/TransactionManager.kt
@@ -18,70 +18,62 @@ package net.taler.wallet.transactions
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.asLiveData
-import androidx.lifecycle.switchMap
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.kotlin.readValue
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.channels.awaitClose
-import kotlinx.coroutines.flow.callbackFlow
-import kotlinx.coroutines.flow.onCompletion
-import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.launch
 import net.taler.wallet.backend.WalletBackendApi
+import net.taler.wallet.history.History
+import net.taler.wallet.history.HistoryEvent
+import org.json.JSONObject
 
 sealed class TransactionsResult {
     object Error : TransactionsResult()
-    class Success(val transactions: Transactions) : TransactionsResult()
+    class Success(val transactions: History) : TransactionsResult()
 }
 
-@Suppress("EXPERIMENTAL_API_USAGE")
 class TransactionManager(
     private val walletBackendApi: WalletBackendApi,
+    private val scope: CoroutineScope,
     private val mapper: ObjectMapper
 ) {
 
     private val mProgress = MutableLiveData<Boolean>()
     val progress: LiveData<Boolean> = mProgress
 
-    val showAll = MutableLiveData<Boolean>()
-
     var selectedCurrency: String? = null
-    var selectedEvent: Transaction? = null
+    var selectedEvent: HistoryEvent? = null
 
-    val transactions: LiveData<TransactionsResult> = showAll.switchMap { showAll ->
-        loadTransactions(showAll)
-            .onStart { mProgress.postValue(true) }
-            .onCompletion { mProgress.postValue(false) }
-            .asLiveData(Dispatchers.IO)
-    }
+    private val mTransactions = MutableLiveData<TransactionsResult>()
+    val transactions: LiveData<TransactionsResult> = mTransactions
 
-    private fun loadTransactions(showAll: Boolean) = callbackFlow {
+    fun loadTransactions() {
+        mProgress.postValue(true)
         walletBackendApi.sendRequest("getHistory", null) { isError, result ->
-            launch(Dispatchers.Default) {
-                if (isError) {
-                    offer(TransactionsResult.Error)
-                    close()
-                    return@launch
-                }
-                val transactions = Transactions()
-                val json = result.getJSONArray("history")
-                val currency = selectedCurrency
-                for (i in 0 until json.length()) {
-                    val event: Transaction = mapper.readValue(json.getString(i))
-                    event.json = json.getJSONObject(i)
-                    if (currency == null || event.isCurrency(currency)) {
-                        transactions.add(event)
-                    }
-                }
-                transactions.reverse()  // show latest first
-                val filtered =
-                    if (showAll) transactions else transactions.filter { it.showToUser } as Transactions
-                offer(TransactionsResult.Success(filtered))
-                close()
+            scope.launch(Dispatchers.Default) {
+                onTransactionsLoaded(isError, result)
+            }
+        }
+    }
+
+    private fun onTransactionsLoaded(isError: Boolean, result: JSONObject) {
+        if (isError) {
+            mTransactions.postValue(TransactionsResult.Error)
+            return
+        }
+        val transactions = History()
+        val json = result.getJSONArray("history")
+        val currency = selectedCurrency
+        for (i in 0 until json.length()) {
+            val event: HistoryEvent = mapper.readValue(json.getString(i))
+            if (event.showToUser && (currency == null || event.isCurrency(currency))) {
+                transactions.add(event)
             }
         }
-        awaitClose()
+        transactions.reverse()  // show latest first
+        mProgress.postValue(false)
+        mTransactions.postValue(TransactionsResult.Success(transactions))
     }
 
 }