diff options
author | Torsten Grote <t@grobox.de> | 2023-04-11 11:00:40 -0300 |
---|---|---|
committer | Torsten Grote <t@grobox.de> | 2023-04-11 11:00:40 -0300 |
commit | f5aced13fda3132d5ee3a6947fe95f7b7b22b98a (patch) | |
tree | fe3f89cc2f43a5c87cc154a9e9f706bc5bd56b8f /wallet/src/main/java/net/taler/wallet/deposit/DepositManager.kt | |
parent | e6f87a0a63e8692bbde182877366719e4ea9ab94 (diff) | |
download | taler-android-f5aced13fda3132d5ee3a6947fe95f7b7b22b98a.tar.gz taler-android-f5aced13fda3132d5ee3a6947fe95f7b7b22b98a.tar.bz2 taler-android-f5aced13fda3132d5ee3a6947fe95f7b7b22b98a.zip |
[wallet] Validate IBAN with wallet core when making deposits
Diffstat (limited to 'wallet/src/main/java/net/taler/wallet/deposit/DepositManager.kt')
-rw-r--r-- | wallet/src/main/java/net/taler/wallet/deposit/DepositManager.kt | 33 |
1 files changed, 32 insertions, 1 deletions
diff --git a/wallet/src/main/java/net/taler/wallet/deposit/DepositManager.kt b/wallet/src/main/java/net/taler/wallet/deposit/DepositManager.kt index 0f10b5f..91f7ad5 100644 --- a/wallet/src/main/java/net/taler/wallet/deposit/DepositManager.kt +++ b/wallet/src/main/java/net/taler/wallet/deposit/DepositManager.kt @@ -47,6 +47,32 @@ class DepositManager( @UiThread fun onDepositButtonClicked(amount: Amount, receiverName: String, iban: String, bic: String) { + if (depositState.value is DepositState.FeesChecked) { + // fees already checked, so IBAN was validated, can make deposit directly + makeIbanDeposit(amount, receiverName, iban, bic) + } else { + // validate IBAN first + mDepositState.value = DepositState.CheckingFees + scope.launch { + api.request("validateIban", ValidateIbanResponse.serializer()) { + put("iban", iban) + }.onError { + Log.e(TAG, "Error validateIban $it") + mDepositState.value = DepositState.Error(it.userFacingMsg) + }.onSuccess { response -> + if (response.valid) { + // only prepare/make deposit, if IBAN is valid + makeIbanDeposit(amount, receiverName, iban, bic) + } else { + mDepositState.value = DepositState.IbanInvalid + } + } + } + } + } + + @UiThread + private fun makeIbanDeposit(amount: Amount, receiverName: String, iban: String, bic: String) { val paytoUri: String = PaytoUriIban( iban = iban, bic = bic, @@ -66,7 +92,7 @@ class DepositManager( } private fun makeDeposit(amount: Amount, uri: String) { - if (depositState.value.showFees) makeDeposit( + if (depositState.value is DepositState.FeesChecked) makeDeposit( paytoUri = uri, amount = amount, totalDepositCost = depositState.value.totalDepositCost @@ -126,6 +152,11 @@ class DepositManager( } @Serializable +data class ValidateIbanResponse( + val valid: Boolean, +) + +@Serializable data class PrepareDepositResponse( val totalDepositCost: Amount, val effectiveDepositAmount: Amount, |