[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-android] 09/11: [wallet] Fully remove deprecated status fie
From: |
gnunet |
Subject: |
[taler-taler-android] 09/11: [wallet] Fully remove deprecated status fields |
Date: |
Tue, 11 Jul 2023 16:23:37 +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 13c4700300ff83a88d0f2eabbdb306e94c78c4cc
Author: Iván Ávalos <avalos@disroot.org>
AuthorDate: Tue Jul 4 11:03:41 2023 -0600
[wallet] Fully remove deprecated status fields
---
.../wallet/payment/TransactionPaymentComposable.kt | 2 --
.../wallet/transactions/TransactionAdapter.kt | 32 ++++++++++++++---
.../net/taler/wallet/transactions/Transactions.kt | 40 ----------------------
3 files changed, 27 insertions(+), 47 deletions(-)
diff --git
a/wallet/src/main/java/net/taler/wallet/payment/TransactionPaymentComposable.kt
b/wallet/src/main/java/net/taler/wallet/payment/TransactionPaymentComposable.kt
index 19dd11d..e6a65d1 100644
---
a/wallet/src/main/java/net/taler/wallet/payment/TransactionPaymentComposable.kt
+++
b/wallet/src/main/java/net/taler/wallet/payment/TransactionPaymentComposable.kt
@@ -40,7 +40,6 @@ import net.taler.wallet.backend.TalerErrorInfo
import net.taler.wallet.compose.TalerSurface
import net.taler.wallet.transactions.AmountType
import net.taler.wallet.transactions.ErrorTransactionButton
-import net.taler.wallet.transactions.PaymentStatus
import net.taler.wallet.transactions.TransactionAction
import net.taler.wallet.transactions.TransactionAction.Abort
import net.taler.wallet.transactions.TransactionAction.Retry
@@ -148,7 +147,6 @@ fun TransactionPaymentComposablePreview() {
fulfillmentUrl = "https://bank.demo.taler.net/",
products = listOf(),
),
- status = PaymentStatus.Paid,
amountRaw = Amount.fromString("TESTKUDOS", "42.1337"),
amountEffective = Amount.fromString("TESTKUDOS", "42.23"),
error = TalerErrorInfo(code =
TalerErrorCode.WALLET_WITHDRAWAL_KYC_REQUIRED),
diff --git
a/wallet/src/main/java/net/taler/wallet/transactions/TransactionAdapter.kt
b/wallet/src/main/java/net/taler/wallet/transactions/TransactionAdapter.kt
index dd46a92..958ba0c 100644
--- a/wallet/src/main/java/net/taler/wallet/transactions/TransactionAdapter.kt
+++ b/wallet/src/main/java/net/taler/wallet/transactions/TransactionAdapter.kt
@@ -36,7 +36,17 @@ import net.taler.common.exhaustive
import net.taler.common.toRelativeTime
import net.taler.wallet.R
import net.taler.wallet.transactions.TransactionAdapter.TransactionViewHolder
+import net.taler.wallet.transactions.TransactionMajorState.Aborted
+import net.taler.wallet.transactions.TransactionMajorState.Aborting
+import net.taler.wallet.transactions.TransactionMajorState.Deleted
+import net.taler.wallet.transactions.TransactionMajorState.Dialog
+import net.taler.wallet.transactions.TransactionMajorState.Done
+import net.taler.wallet.transactions.TransactionMajorState.Failed
+import net.taler.wallet.transactions.TransactionMajorState.None
import net.taler.wallet.transactions.TransactionMajorState.Pending
+import net.taler.wallet.transactions.TransactionMajorState.Suspended
+import net.taler.wallet.transactions.TransactionMajorState.SuspendedAborting
+import net.taler.wallet.transactions.TransactionMajorState.Unknown
internal class TransactionAdapter(
private val listener: OnTransactionClickListener
@@ -115,12 +125,24 @@ internal class TransactionAdapter(
extraInfoView.setText(R.string.withdraw_waiting_confirm)
extraInfoView.setTextColor(amountColor)
extraInfoView.visibility = VISIBLE
- } else if (transaction is TransactionPayment && transaction.status
!= PaymentStatus.Paid && transaction.status != PaymentStatus.Accepted) {
- extraInfoView.setText(if (transaction.status ==
PaymentStatus.Aborted) R.string.payment_aborted else R.string.payment_failed)
- extraInfoView.setTextColor(amountColor)
- extraInfoView.visibility = VISIBLE
} else {
- extraInfoView.visibility = GONE
+ when (transaction.txState.major) {
+ Aborted -> R.string.payment_aborted
+ Failed -> R.string.payment_failed
+ None -> null
+ Pending -> null
+ Done -> null
+ Aborting -> null
+ Suspended -> null
+ Dialog -> null
+ SuspendedAborting -> null
+ Deleted -> null
+ Unknown -> null
+ }?.let {
+ extraInfoView.setText(it)
+ } ?: {
+ extraInfoView.visibility = GONE
+ }
}
}
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 cb917db..62e458b 100644
--- a/wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt
+++ b/wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt
@@ -119,30 +119,6 @@ sealed class Transaction {
abstract val generalTitleRes: Int
}
-@Serializable
-enum class ExtendedStatus {
- @SerialName("pending")
- Pending,
-
- @SerialName("done")
- Done,
-
- @SerialName("aborting")
- Aborting,
-
- @SerialName("aborted")
- Aborted,
-
- @SerialName("suspended")
- Suspended,
-
- @SerialName("failed")
- Failed,
-
- @SerialName("deleted")
- Deleted;
-}
-
@Serializable
enum class TransactionAction {
// Common States
@@ -238,7 +214,6 @@ class TransactionPayment(
override val txState: TransactionState,
override val txActions: List<TransactionAction>,
val info: TransactionInfo,
- val status: PaymentStatus,
override val error: TalerErrorInfo? = null,
override val amountRaw: Amount,
override val amountEffective: Amount,
@@ -271,21 +246,6 @@ class TransactionInfo(
val fulfillmentMessage_i18n: Map<String, String>? = null,
)
-@Serializable
-enum class PaymentStatus {
- @SerialName("aborted")
- Aborted,
-
- @SerialName("failed")
- Failed,
-
- @SerialName("paid")
- Paid,
-
- @SerialName("accepted")
- Accepted
-}
-
@Serializable
@SerialName("refund")
class TransactionRefund(
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-taler-android] branch master updated (e7959e8 -> ef51462), gnunet, 2023/07/11
- [taler-taler-android] 01/11: [wallet] Initial work for DD37 transitions, gnunet, 2023/07/11
- [taler-taler-android] 03/11: [wallet] Handle "fail" DD37 action and prevent non-deletable transactions from being deleted., gnunet, 2023/07/11
- [taler-taler-android] 04/11: [wallet] Better error handling for tx actions., gnunet, 2023/07/11
- [taler-taler-android] 02/11: [wallet] Implemented DD37 with the new txActions field, gnunet, 2023/07/11
- [taler-taler-android] 07/11: [wallet] Make DD37 dialog data non-nullable and rename callback, gnunet, 2023/07/11
- [taler-taler-android] 11/11: [wallet] release 0.9.3+p4, gnunet, 2023/07/11
- [taler-taler-android] 09/11: [wallet] Fully remove deprecated status fields,
gnunet <=
- [taler-taler-android] 08/11: [wallet] Show suspend/resume only in devMode and rename "fail" to "cancel" in UI, gnunet, 2023/07/11
- [taler-taler-android] 06/11: [wallet] Bump wallet-core to 0.9.3-dev.11, gnunet, 2023/07/11
- [taler-taler-android] 05/11: [wallet] DD37 fixes, gnunet, 2023/07/11
- [taler-taler-android] 10/11: [wallet] some dd37 fixes after merging, gnunet, 2023/07/11