taler-android

commit cc91a46ba6986dc37d20a0e2ef74baad18085130
parent 58c1280d08868b2b38f7d1d71e79b6304efd3ac9
Author: Iván Ávalos <avalos@disroot.org>
Date:   Thu, 23 Jan 2025 13:50:04 +0100

[pos] remove deprecated taler://fulfillment-success/ URI

Diffstat:
M
merchant-terminal/src/main/java/net/taler/merchantpos/order/Order.kt
 | 
10
----------
M
taler-kotlin-android/src/main/java/net/taler/common/ContractTerms.kt
 | 
2
++

2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/order/Order.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/order/Order.kt
@@ -22,11 +22,8 @@ import net.taler.common.Timestamp
 import net.taler.common.now
 import net.taler.merchantpos.config.Category
 import net.taler.merchantpos.config.ConfigProduct
-import java.net.URLEncoder
 import java.util.concurrent.TimeUnit.HOURS
 
-private const val FULFILLMENT_PREFIX = "taler://fulfillment-success/"
-
 data class Order(val id: Int, val currency: String, val availableCategories: Map<Int, Category>) {
     val products = ArrayList<ConfigProduct>()
     val title: String = id.toString()
@@ -110,19 +107,12 @@ data class Order(val id: Int, val currency: String, val availableCategories: Map
             }.toMap()
         }
 
-    private val fulfillmentUri: String
-        get() {
-            val fulfillmentId = "${now()}-${hashCode()}"
-            return "$FULFILLMENT_PREFIX${URLEncoder.encode(summary, "UTF-8")}#$fulfillmentId"
-        }
-
     fun toContractTerms(): ContractTerms {
         val deadline = Timestamp.fromMillis(now() + HOURS.toMillis(1))
         return ContractTerms(
             summary = summary,
             summaryI18n = summaryI18n,
             amount = total,
-            fulfillmentUrl = fulfillmentUri,
             products = products.map { it.toContractProduct() },
             refundDeadline = deadline,
             wireTransferDeadline = deadline,
diff --git a/taler-kotlin-android/src/main/java/net/taler/common/ContractTerms.kt b/taler-kotlin-android/src/main/java/net/taler/common/ContractTerms.kt
@@ -36,6 +36,8 @@ data class ContractTerms(
     val fulfillmentUrl: String? = null,
     @SerialName("fulfillment_message")
     val fulfillmentMessage: String? = null,
+    @SerialName("fulfillment_message_i18n")
+    val fulfillmentMessageI18n: Map <String, String>? = null,
     val products: List<ContractProduct>,
     @SerialName("wire_transfer_deadline")
     val wireTransferDeadline: Timestamp? = null,