summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--wallet/src/main/java/net/taler/wallet/MainViewModel.kt2
-rw-r--r--wallet/src/main/java/net/taler/wallet/exchanges/ExchangeManager.kt47
-rw-r--r--wallet/src/main/java/net/taler/wallet/transactions/TransactionManager.kt64
-rw-r--r--wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt3
-rw-r--r--wallet/src/main/java/net/taler/wallet/withdraw/WithdrawManager.kt6
5 files changed, 58 insertions, 64 deletions
diff --git a/wallet/src/main/java/net/taler/wallet/MainViewModel.kt b/wallet/src/main/java/net/taler/wallet/MainViewModel.kt
index 6249551..b4aa1dc 100644
--- a/wallet/src/main/java/net/taler/wallet/MainViewModel.kt
+++ b/wallet/src/main/java/net/taler/wallet/MainViewModel.kt
@@ -103,7 +103,7 @@ class MainViewModel(val app: Application) : AndroidViewModel(app) {
val pendingOperationsManager: PendingOperationsManager = PendingOperationsManager(api)
val transactionManager: TransactionManager = TransactionManager(api, viewModelScope, mapper)
val refundManager = RefundManager(api, viewModelScope)
- val exchangeManager: ExchangeManager = ExchangeManager(api, mapper)
+ val exchangeManager: ExchangeManager = ExchangeManager(api, viewModelScope)
private val mTransactionsEvent = MutableLiveData<Event<String>>()
val transactionsEvent: LiveData<Event<String>> = mTransactionsEvent
diff --git a/wallet/src/main/java/net/taler/wallet/exchanges/ExchangeManager.kt b/wallet/src/main/java/net/taler/wallet/exchanges/ExchangeManager.kt
index 9d31b5f..8205eb7 100644
--- a/wallet/src/main/java/net/taler/wallet/exchanges/ExchangeManager.kt
+++ b/wallet/src/main/java/net/taler/wallet/exchanges/ExchangeManager.kt
@@ -19,17 +19,22 @@ package net.taler.wallet.exchanges
import android.util.Log
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
-import com.fasterxml.jackson.databind.ObjectMapper
-import com.fasterxml.jackson.module.kotlin.readValue
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import kotlinx.serialization.Serializable
import net.taler.common.Event
import net.taler.common.toEvent
import net.taler.wallet.TAG
import net.taler.wallet.backend.WalletBackendApi
-import org.json.JSONObject
+
+@Serializable
+data class ExchangeListResponse(
+ val exchanges: List<ExchangeItem>
+)
class ExchangeManager(
- private val walletBackendApi: WalletBackendApi,
- private val mapper: ObjectMapper
+ private val api: WalletBackendApi,
+ private val scope: CoroutineScope
) {
private val mProgress = MutableLiveData<Boolean>()
@@ -45,31 +50,31 @@ class ExchangeManager(
private fun list(): LiveData<List<ExchangeItem>> {
mProgress.value = true
- walletBackendApi.sendRequest("listExchanges") { isError, result ->
- if (isError) {
+ scope.launch {
+ val response = api.request("listExchanges", ExchangeListResponse.serializer())
+ response.onError {
throw AssertionError("Wallet core failed to return exchanges!")
- } else {
- val exchanges: List<ExchangeItem> = mapper.readValue(result.getString("exchanges"))
- Log.d(TAG, "Exchange list: $exchanges")
+ }.onSuccess {
+ Log.d(TAG, "Exchange list: ${it.exchanges}")
mProgress.value = false
- mExchanges.value = exchanges
+ mExchanges.value = it.exchanges
}
}
return mExchanges
}
- fun add(exchangeUrl: String) {
+ fun add(exchangeUrl: String) = scope.launch {
mProgress.value = true
- val args = JSONObject().apply { put("exchangeBaseUrl", exchangeUrl) }
- walletBackendApi.sendRequest("addExchange", args) { isError, result ->
+ api.request<Unit>("addExchange") {
+ put("exchangeBaseUrl", exchangeUrl)
+ }.onError {
mProgress.value = false
- if (isError) {
- Log.e(TAG, "$result")
- mAddError.value = true.toEvent()
- } else {
- Log.d(TAG, "Exchange $exchangeUrl added")
- list()
- }
+ Log.e(TAG, "Error adding exchange: $it")
+ mAddError.value = true.toEvent()
+ }.onSuccess {
+ mProgress.value = false
+ Log.d(TAG, "Exchange $exchangeUrl added")
+ list()
}
}
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 d398f57..e9b1b71 100644
--- a/wallet/src/main/java/net/taler/wallet/transactions/TransactionManager.kt
+++ b/wallet/src/main/java/net/taler/wallet/transactions/TransactionManager.kt
@@ -17,20 +17,14 @@
package net.taler.wallet.transactions
import androidx.annotation.UiThread
-import androidx.annotation.WorkerThread
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
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.launch
import net.taler.wallet.backend.WalletBackendApi
-import net.taler.wallet.getErrorString
-import org.json.JSONObject
import java.util.HashMap
-import java.util.LinkedList
sealed class TransactionsResult {
class Error(val msg: String) : TransactionsResult()
@@ -38,7 +32,7 @@ sealed class TransactionsResult {
}
class TransactionManager(
- private val walletBackendApi: WalletBackendApi,
+ private val api: WalletBackendApi,
private val scope: CoroutineScope,
private val mapper: ObjectMapper
) {
@@ -62,44 +56,36 @@ class TransactionManager(
}
@UiThread
- fun loadTransactions(searchQuery: String? = null) {
- val currency = selectedCurrency ?: return
+ fun loadTransactions(searchQuery: String? = null) = scope.launch {
+ val currency = selectedCurrency ?: return@launch
val liveData = mTransactions.getOrPut(currency) { MutableLiveData() }
if (searchQuery == null && allTransactions.containsKey(currency)) {
liveData.value = TransactionsResult.Success(allTransactions[currency]!!)
}
if (liveData.value == null) mProgress.value = true
- val request = JSONObject(mapOf("currency" to currency))
- searchQuery?.let { request.put("search", it) }
- walletBackendApi.sendRequest("getTransactions", request) { isError, result ->
- if (isError) {
- liveData.postValue(TransactionsResult.Error(getErrorString(result)))
- mProgress.postValue(false)
- } else {
- val currencyToUpdate = if (searchQuery == null) currency else null
- scope.launch(Dispatchers.Default) {
- onTransactionsLoaded(liveData, currencyToUpdate, result)
- }
- }
- }
- }
- @WorkerThread
- private fun onTransactionsLoaded(
- liveData: MutableLiveData<TransactionsResult>,
- currency: String?, // only non-null if we should update all transactions cache
- result: JSONObject
- ) {
- val transactionsArray = result.getString("transactions")
- 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
- mProgress.postValue(false)
- liveData.postValue(TransactionsResult.Success(transactions))
- // update all transactions on UiThread if there was a currency
- currency?.let {
- scope.launch(Dispatchers.Main) { allTransactions[currency] = transactions }
+ api.request<Transactions>("getTransactions", mapper) {
+ if (searchQuery != null) put("search", searchQuery)
+ put("currency", currency)
+ }.onError {
+ liveData.postValue(TransactionsResult.Error(it.userFacingMsg))
+ mProgress.postValue(false)
+ }.onSuccess { result ->
+ val transactions = result.transactions
+ // TODO remove when fixed in wallet-core
+ val comparator = compareBy<Transaction>(
+ { it.pending },
+ { it.timestamp.ms },
+ { it.transactionId }
+ )
+ transactions.sortWith(comparator)
+ transactions.reverse() // show latest first
+
+ mProgress.value = false
+ liveData.value = TransactionsResult.Success(transactions)
+
+ // update all transactions on UiThread if there was a currency
+ if (searchQuery == null) allTransactions[currency] = transactions
}
}
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 08f02fc..d227183 100644
--- a/wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt
+++ b/wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt
@@ -36,8 +36,9 @@ import net.taler.wallet.R
import net.taler.wallet.cleanExchange
import net.taler.wallet.transactions.WithdrawalDetails.ManualTransfer
import net.taler.wallet.transactions.WithdrawalDetails.TalerBankIntegrationApi
+import java.util.LinkedList
-data class Transactions(val transactions: List<Transaction>)
+data class Transactions(val transactions: LinkedList<Transaction>)
@JsonTypeInfo(use = NAME, include = PROPERTY, property = "type")
@JsonSubTypes(
diff --git a/wallet/src/main/java/net/taler/wallet/withdraw/WithdrawManager.kt b/wallet/src/main/java/net/taler/wallet/withdraw/WithdrawManager.kt
index 1066550..2aaa5dc 100644
--- a/wallet/src/main/java/net/taler/wallet/withdraw/WithdrawManager.kt
+++ b/wallet/src/main/java/net/taler/wallet/withdraw/WithdrawManager.kt
@@ -78,9 +78,11 @@ class WithdrawManager(
var exchangeFees: ExchangeFees? = null
private set
- fun withdrawTestkudos() {
+ fun withdrawTestkudos() = scope.launch {
testWithdrawalInProgress.value = true
- api.sendRequest("withdrawTestkudos") { _, _ ->
+ api.request<Unit>("withdrawTestkudos").onError {
+ testWithdrawalInProgress.postValue(false)
+ }.onSuccess {
testWithdrawalInProgress.postValue(false)
}
}