1 files changed, 59 insertions, 35 deletions

diff --git a/wallet/src/main/java/net/taler/wallet/payment/PaymentManager.kt b/wallet/src/main/java/net/taler/wallet/payment/PaymentManager.kt
index ae091df..35cd9e6 100644
--- a/wallet/src/main/java/net/taler/wallet/payment/PaymentManager.kt
+++ b/wallet/src/main/java/net/taler/wallet/payment/PaymentManager.kt
@@ -25,13 +25,14 @@ import kotlinx.coroutines.launch
 import net.taler.common.Amount
 import net.taler.common.ContractTerms
 import net.taler.wallet.TAG
-import net.taler.wallet.backend.WalletBackendApi
 import net.taler.wallet.backend.TalerErrorInfo
+import net.taler.wallet.backend.WalletBackendApi
 import net.taler.wallet.payment.PayStatus.AlreadyPaid
 import net.taler.wallet.payment.PayStatus.InsufficientBalance
 import net.taler.wallet.payment.PreparePayResponse.AlreadyConfirmedResponse
 import net.taler.wallet.payment.PreparePayResponse.InsufficientBalanceResponse
 import net.taler.wallet.payment.PreparePayResponse.PaymentPossibleResponse
+import org.json.JSONObject
 
 val REGEX_PRODUCT_IMAGE = Regex("^data:image/(jpeg|png);base64,([A-Za-z0-9+/=]+)$")
 
@@ -40,20 +41,28 @@ sealed class PayStatus {
     object Loading : PayStatus()
     data class Prepared(
         val contractTerms: ContractTerms,
-        val proposalId: String,
+        val transactionId: String,
         val amountRaw: Amount,
-        val amountEffective: Amount
+        val amountEffective: Amount,
     ) : PayStatus()
 
     data class InsufficientBalance(
         val contractTerms: ContractTerms,
-        val amountRaw: Amount
+        val amountRaw: Amount,
     ) : PayStatus()
 
-    // TODO bring user to fulfilment URI
-    object AlreadyPaid : PayStatus()
-    data class Error(val error: String) : PayStatus()
-    data class Success(val currency: String) : PayStatus()
+    data class AlreadyPaid(
+        val transactionId: String,
+    ) : PayStatus()
+
+    data class Pending(
+        val transactionId: String? = null,
+        val error: TalerErrorInfo? = null,
+    ) : PayStatus()
+    data class Success(
+        val transactionId: String,
+        val currency: String,
+    ) : PayStatus()
 }
 
 class PaymentManager(
@@ -67,50 +76,65 @@ class PaymentManager(
     @UiThread
     fun preparePay(url: String) = scope.launch {
         mPayStatus.value = PayStatus.Loading
-        api.request("preparePay", PreparePayResponse.serializer()) {
+        api.request("preparePayForUri", PreparePayResponse.serializer()) {
             put("talerPayUri", url)
         }.onError {
-            handleError("preparePay", it)
+            handleError("preparePayForUri", it)
         }.onSuccess { response ->
             mPayStatus.value = when (response) {
                 is PaymentPossibleResponse -> response.toPayStatusPrepared()
                 is InsufficientBalanceResponse -> InsufficientBalance(
-                    response.contractTerms,
-                    response.amountRaw
+                    contractTerms = response.contractTerms,
+                    amountRaw = response.amountRaw
+                )
+                is AlreadyConfirmedResponse -> AlreadyPaid(
+                    transactionId = response.transactionId,
                 )
-                is AlreadyConfirmedResponse -> AlreadyPaid
             }
         }
     }
 
-    fun confirmPay(proposalId: String, currency: String) = scope.launch {
+    fun confirmPay(transactionId: String, currency: String) = scope.launch {
         api.request("confirmPay", ConfirmPayResult.serializer()) {
-            put("proposalId", proposalId)
+            put("transactionId", transactionId)
         }.onError {
             handleError("confirmPay", it)
-        }.onSuccess {
-            mPayStatus.postValue(PayStatus.Success(currency))
-        }
-    }
-
-    @UiThread
-    fun abortPay() {
-        val ps = payStatus.value
-        if (ps is PayStatus.Prepared) {
-            abortProposal(ps.proposalId)
+        }.onSuccess { response ->
+            mPayStatus.postValue(when (response) {
+                is ConfirmPayResult.Done -> PayStatus.Success(
+                    transactionId = response.transactionId,
+                    currency = currency,
+                )
+                is ConfirmPayResult.Pending -> PayStatus.Pending(
+                    transactionId = response.transactionId,
+                    error = response.lastError,
+                )
+            })
         }
-        resetPayStatus()
     }
 
-    internal fun abortProposal(proposalId: String) = scope.launch {
-        Log.i(TAG, "aborting proposal")
-        api.request<Unit>("abortProposal") {
-            put("proposalId", proposalId)
+    fun preparePayForTemplate(url: String, summary: String?, amount: Amount?) = scope.launch {
+        mPayStatus.value = PayStatus.Loading
+        api.request("preparePayForTemplate", PreparePayResponse.serializer()) {
+            put("talerPayTemplateUri", url)
+            put("templateParams", JSONObject().apply {
+                summary?.let { put("summary", it) }
+                amount?.let { put("amount", it.toJSONString()) }
+            })
         }.onError {
-            Log.e(TAG, "received error response to abortProposal")
-            handleError("abortProposal", it)
-        }.onSuccess {
-            mPayStatus.postValue(PayStatus.None)
+            handleError("preparePayForTemplate", it)
+        }.onSuccess { response ->
+            mPayStatus.value = when (response) {
+                is PaymentPossibleResponse -> response.toPayStatusPrepared()
+                is InsufficientBalanceResponse -> InsufficientBalance(
+                    contractTerms = response.contractTerms,
+                    amountRaw = response.amountRaw,
+                )
+
+                is AlreadyConfirmedResponse -> AlreadyPaid(
+                    transactionId = response.transactionId,
+                )
+            }
         }
     }
 
@@ -121,7 +145,7 @@ class PaymentManager(
 
     private fun handleError(operation: String, error: TalerErrorInfo) {
         Log.e(TAG, "got $operation error result $error")
-        mPayStatus.value = PayStatus.Error(error.userFacingMsg)
+        mPayStatus.value = PayStatus.Pending(error = error)
     }
 
 }