From 4e7b95796d764848731f32e9b9a9bc0826257bb2 Mon Sep 17 00:00:00 2001 From: Iván Ávalos Date: Mon, 1 Apr 2024 12:01:14 -0600 Subject: [wallet] Fix deserialization of unknown minor states bug 0008552 --- .../net/taler/wallet/backend/BackendManager.kt | 1 + .../taler/wallet/transactions/TransactionState.kt | 81 ---------------------- 2 files changed, 1 insertion(+), 81 deletions(-) (limited to 'wallet/src/main/java') diff --git a/wallet/src/main/java/net/taler/wallet/backend/BackendManager.kt b/wallet/src/main/java/net/taler/wallet/backend/BackendManager.kt index 1339dca..9292ef5 100644 --- a/wallet/src/main/java/net/taler/wallet/backend/BackendManager.kt +++ b/wallet/src/main/java/net/taler/wallet/backend/BackendManager.kt @@ -39,6 +39,7 @@ class BackendManager( private const val TAG_CORE = "taler-wallet-embedded" val json = Json { ignoreUnknownKeys = true + coerceInputValues = true } @JvmStatic private val initialized = AtomicBoolean(false) diff --git a/wallet/src/main/java/net/taler/wallet/transactions/TransactionState.kt b/wallet/src/main/java/net/taler/wallet/transactions/TransactionState.kt index 7091c90..f89be83 100644 --- a/wallet/src/main/java/net/taler/wallet/transactions/TransactionState.kt +++ b/wallet/src/main/java/net/taler/wallet/transactions/TransactionState.kt @@ -79,102 +79,21 @@ enum class TransactionMajorState { @Serializable enum class TransactionMinorState { - @SerialName("unknown") - Unknown, - - @SerialName("deposit") - Deposit, - @SerialName("kyc") KycRequired, - @SerialName("aml") - AmlRequired, - - @SerialName("merge-kyc") - MergeKycRequired, - - @SerialName("track") - Track, - - @SerialName("submit-payment") - SubmitPayment, - - @SerialName("rebind-session") - RebindSession, - - @SerialName("refresh") - Refresh, - - @SerialName("pickup") - Pickup, - - @SerialName("auto-refund") - AutoRefund, - - @SerialName("user") - User, - - @SerialName("bank") - Bank, - @SerialName("exchange") Exchange, - @SerialName("claim-proposal") - ClaimProposal, - - @SerialName("check-refund") - CheckRefund, - @SerialName("create-purse") CreatePurse, - @SerialName("delete-purse") - DeletePurse, - - @SerialName("refresh-expired") - RefreshExpired, - @SerialName("ready") Ready, - @SerialName("merge") - Merge, - - @SerialName("repurchase") - Repurchase, - - @SerialName("bank-register-reserve") - BankRegisterReserve, - @SerialName("bank-confirm-transfer") BankConfirmTransfer, - @SerialName("withdraw-coins") - WithdrawCoins, - @SerialName("exchange-wait-reserve") ExchangeWaitReserve, - - @SerialName("aborting-bank") - AbortingBank, - - @SerialName("refused") - Refused, - - @SerialName("withdraw") - Withdraw, - - @SerialName("merchant-order-proposed") - MerchantOrderProposed, - - @SerialName("proposed") - Proposed, - - @SerialName("refund-available") - RefundAvailable, - - @SerialName("accept-refund") - AcceptRefund } -- cgit v1.2.3