gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[taler-taler-android] branch master updated (29d9c97 -> 4e7b957)


From: gnunet
Subject: [taler-taler-android] branch master updated (29d9c97 -> 4e7b957)
Date: Mon, 01 Apr 2024 20:02:19 +0200

This is an automated email from the git hooks/post-receive script.

ivan-avalos pushed a change to branch master
in repository taler-android.

    from 29d9c97  [wallet] Add async programming TODO
     new 81f5898  [wallet] Add missing function
     new 4e7b957  [wallet] Fix deserialization of unknown minor states

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../src/main/java/net/taler/wallet/MainActivity.kt |  6 +-
 .../net/taler/wallet/backend/BackendManager.kt     |  1 +
 .../taler/wallet/transactions/TransactionState.kt  | 81 ----------------------
 3 files changed, 6 insertions(+), 82 deletions(-)

diff --git a/wallet/src/main/java/net/taler/wallet/MainActivity.kt 
b/wallet/src/main/java/net/taler/wallet/MainActivity.kt
index 7726abc..7baf29f 100644
--- a/wallet/src/main/java/net/taler/wallet/MainActivity.kt
+++ b/wallet/src/main/java/net/taler/wallet/MainActivity.kt
@@ -55,7 +55,6 @@ import 
net.taler.wallet.HostCardEmulatorService.Companion.MERCHANT_NFC_CONNECTED
 import 
net.taler.wallet.HostCardEmulatorService.Companion.MERCHANT_NFC_DISCONNECTED
 import 
net.taler.wallet.HostCardEmulatorService.Companion.TRIGGER_PAYMENT_ACTION
 import net.taler.wallet.databinding.ActivityMainBinding
-import net.taler.wallet.events.ObservabilityDialog
 
 class MainActivity : AppCompatActivity(), OnNavigationItemSelectedListener,
     OnPreferenceStartFragmentCallback {
@@ -165,6 +164,11 @@ class MainActivity : AppCompatActivity(), 
OnNavigationItemSelectedListener,
         return true
     }
 
+    private fun handleTalerUri(uri: String, from: String) {
+        val args = bundleOf("uri" to uri, "from" to from)
+        nav.navigate(R.id.action_global_handle_uri, args)
+    }
+
     override fun onDestroy() {
         unregisterReceiver(triggerPaymentReceiver)
         unregisterReceiver(nfcConnectedReceiver)
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
 }

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]