taler-android

commit 2677164bb5c4e461440c1b2f61e2ac781057062a
parent fe7d07be357a03d9fbb2f581b43721879526edef
Author: Florian Dold <florian@dold.me>
Date:   Tue, 11 Jun 2024 17:07:08 +0200

[wallet] Remove redundant required_currency field in templates

Diffstat:
M
wallet/src/main/java/net/taler/wallet/payment/PayTemplateDetails.kt
 | 
17
++---------------

1 file changed, 2 insertions(+), 15 deletions(-)
diff --git a/wallet/src/main/java/net/taler/wallet/payment/PayTemplateDetails.kt b/wallet/src/main/java/net/taler/wallet/payment/PayTemplateDetails.kt
@@ -78,16 +78,6 @@ class WalletTemplateDetails(
      */
     @SerialName("editable_defaults")
     val editableDefaults: TemplateContractDetailsDefaults? = null,
-
-    /**
-     * Required currency for payments.  Useful if no amount is specified in
-     * the template_contract but the user should be required to pay in a
-     * particular currency anyway.  Merchant backends may reject requests if
-     * the template_contract or editable_defaults do specify an amount in a
-     * different currency.  This parameter is optional.
-     */
-    @SerialName("required_currency")
-    val requiredCurrency: String? = null,
 ) {
     val defaultSummary get() = editableDefaults?.summary
         ?: templateContract.summary
@@ -95,8 +85,7 @@ class WalletTemplateDetails(
     val defaultAmount get() = editableDefaults?.amount
         ?: templateContract.amount
 
-    val defaultCurrency get() = requiredCurrency
-        ?: editableDefaults?.currency
+    val defaultCurrency get() = editableDefaults?.currency
         ?: templateContract.currency
 
     fun isSummaryEditable() = templateContract.summary == null
@@ -104,7 +93,6 @@ class WalletTemplateDetails(
     fun isAmountEditable() = templateContract.amount == null
 
     fun isCurrencyEditable(usableCurrencies: List<String>) = isAmountEditable()
-            && requiredCurrency == null
             && templateContract.currency == null
             && usableCurrencies.size > 1
 
@@ -123,4 +111,4 @@ class WalletTemplateDetails(
 data class TemplateParams(
     val amount: Amount? = null,
     val summary: String? = null,
-)
-\ No newline at end of file
+)