1 files changed, 7 insertions, 5 deletions
diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/payment/PaymentManager.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/payment/PaymentManager.kt
index 98161db..efcb158 100644
--- a/merchant-terminal/src/main/java/net/taler/merchantpos/payment/PaymentManager.kt
+++ b/merchant-terminal/src/main/java/net/taler/merchantpos/payment/PaymentManager.kt
@@ -26,8 +26,8 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
+import net.taler.common.RelativeTime
 import net.taler.common.assertUiThread
-import net.taler.lib.common.Duration
 import net.taler.merchantlib.CheckPaymentResponse
 import net.taler.merchantlib.MerchantApi
 import net.taler.merchantlib.PostOrderRequest
@@ -36,10 +36,9 @@ import net.taler.merchantpos.R
 import net.taler.merchantpos.config.ConfigManager
 import net.taler.merchantpos.order.Order
 import java.util.concurrent.TimeUnit.HOURS
-import java.util.concurrent.TimeUnit.MINUTES
 import java.util.concurrent.TimeUnit.SECONDS
 
-private val TIMEOUT = MINUTES.toMillis(2)
+private const val TIMEOUT = Long.MAX_VALUE
 private val CHECK_INTERVAL = SECONDS.toMillis(1)
 
 class PaymentManager(
@@ -74,7 +73,7 @@ class PaymentManager(
         mPayment.value = Payment(order, order.summary, configManager.currency!!)
         val request = PostOrderRequest(
             contractTerms = order.toContractTerms(),
-            refundDelay = Duration(HOURS.toMillis(1))
+            refundDelay = RelativeTime.fromMillis(HOURS.toMillis(1))
         )
         api.postOrder(merchantConfig, request).handle(::onNetworkError) { orderResponse ->
             assertUiThread()
@@ -85,7 +84,10 @@ class PaymentManager(
 
     private fun checkPayment(orderId: String) = scope.launch {
         val merchantConfig = configManager.merchantConfig!!
-        api.checkOrder(merchantConfig, orderId).handle(::onNetworkError) { response ->
+        api.checkOrder(merchantConfig, orderId).handle({ error ->
+            // don't call onNetworkError() to not cancel payment, just keep trying
+            Log.d(TAG, "Network error: $error")
+        }) { response ->
             assertUiThread()
             if (!isActive) return@handle // don't continue if job was cancelled
             val currentValue = requireNotNull(mPayment.value)