[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-android] 01/03: [wallet] manual withdrawals are confirmed w
From: |
gnunet |
Subject: |
[taler-taler-android] 01/03: [wallet] manual withdrawals are confirmed when not pending anymore |
Date: |
Mon, 20 Jul 2020 21:38:30 +0200 |
This is an automated email from the git hooks/post-receive script.
torsten-grote pushed a commit to branch master
in repository taler-android.
commit 35fb3686d411869ac4854f1f56efc46a21c7c42b
Author: Torsten Grote <t@grobox.de>
AuthorDate: Mon Jul 20 10:48:11 2020 -0300
[wallet] manual withdrawals are confirmed when not pending anymore
---
wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
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 ccc40eb..1dc55dc 100644
--- a/wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt
+++ b/wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt
@@ -92,8 +92,11 @@ class TransactionWithdrawal(
override val amountType = AmountType.Positive
override fun getTitle(context: Context) = cleanExchange(exchangeBaseUrl)
override val generalTitleRes = R.string.withdraw_title
- val confirmed: Boolean =
- withdrawalDetails is TalerBankIntegrationApi &&
withdrawalDetails.confirmed
+ val confirmed: Boolean
+ get() = !pending && (
+ (withdrawalDetails is TalerBankIntegrationApi &&
withdrawalDetails.confirmed) ||
+ withdrawalDetails is ManualTransfer
+ )
}
@JsonTypeInfo(use = NAME, include = PROPERTY, property = "type")
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.