diff options
author | Torsten Grote <t@grobox.de> | 2020-04-02 15:12:09 -0300 |
---|---|---|
committer | Torsten Grote <t@grobox.de> | 2020-04-02 15:12:09 -0300 |
commit | e52ee8f55326de402a7ad421c396eb6c81a79a68 (patch) | |
tree | b33d5474a0bc7c73615c3e71010e678bb2f4883f /wallet/src/main/java/net/taler/wallet/withdraw/WithdrawManager.kt | |
parent | 78dcfb7c95fd17c8ee04f4c357b1c9b0a46cb0af (diff) | |
download | taler-android-e52ee8f55326de402a7ad421c396eb6c81a79a68.tar.gz taler-android-e52ee8f55326de402a7ad421c396eb6c81a79a68.tar.bz2 taler-android-e52ee8f55326de402a7ad421c396eb6c81a79a68.zip |
[wallet] Show withdraw fee
Diffstat (limited to 'wallet/src/main/java/net/taler/wallet/withdraw/WithdrawManager.kt')
-rw-r--r-- | wallet/src/main/java/net/taler/wallet/withdraw/WithdrawManager.kt | 16 |
1 files changed, 10 insertions, 6 deletions
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 e252627..26515a5 100644 --- a/wallet/src/main/java/net/taler/wallet/withdraw/WithdrawManager.kt +++ b/wallet/src/main/java/net/taler/wallet/withdraw/WithdrawManager.kt @@ -32,12 +32,14 @@ sealed class WithdrawStatus { val tosText: String, val tosEtag: String, val amount: Amount, + val fee: Amount, val suggestedExchange: String ) : WithdrawStatus() data class ReceivedDetails( val talerWithdrawUri: String, val amount: Amount, + val fee: Amount, val suggestedExchange: String ) : WithdrawStatus() @@ -131,6 +133,10 @@ class WithdrawManager(private val walletBackendApi: WalletBackendApi) { val ei = result.getJSONObject("exchangeWithdrawDetails") val termsOfServiceAccepted = ei.getBoolean("termsOfServiceAccepted") + val withdrawFee = Amount.fromJsonObject(ei.getJSONObject("withdrawFee")) + val overhead = Amount.fromJsonObject(ei.getJSONObject("overhead")) + val fee = withdrawFee + overhead + if (!termsOfServiceAccepted) { val exchange = ei.getJSONObject("exchangeInfo") val tosText = exchange.getString("termsOfServiceText") @@ -138,10 +144,8 @@ class WithdrawManager(private val walletBackendApi: WalletBackendApi) { withdrawStatus.postValue( WithdrawStatus.TermsOfServiceReviewRequired( status.talerWithdrawUri, - selectedExchange, - tosText, - tosEtag, - amount, + selectedExchange, tosText, tosEtag, + amount, fee, suggestedExchange ) ) @@ -149,7 +153,7 @@ class WithdrawManager(private val walletBackendApi: WalletBackendApi) { withdrawStatus.postValue( ReceivedDetails( status.talerWithdrawUri, - amount, + amount, fee, suggestedExchange ) ) @@ -195,7 +199,7 @@ class WithdrawManager(private val walletBackendApi: WalletBackendApi) { Log.e(TAG, "Error acceptExchangeTermsOfService ${result.toString(4)}") return@sendRequest } - val status = ReceivedDetails(s.talerWithdrawUri, s.amount, s.suggestedExchange) + val status = ReceivedDetails(s.talerWithdrawUri, s.amount, s.fee, s.suggestedExchange) withdrawStatus.postValue(status) } } |