[taler-taler-android] branch master updated (d9985f0 -> 3c2bf6e)

[gnunet]

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

torsten-grote pushed a change to branch master
in repository taler-android.

    from d9985f0  [wallet] Show text on floating scan action button
     new 7e8d39a  [pos] Keep checking payment status as long as payment 
fragment is shown
     new 3c2bf6e  [pos] Release 0.2.3

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:
 merchant-terminal/build.gradle                                    | 4 ++--
 .../src/main/java/net/taler/merchantpos/payment/PaymentManager.kt | 8 +++++---
 .../java/net/taler/merchantpos/payment/ProcessPaymentFragment.kt  | 4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/merchant-terminal/build.gradle b/merchant-terminal/build.gradle
index 71936b5..8b7ccf9 100644
--- a/merchant-terminal/build.gradle
+++ b/merchant-terminal/build.gradle
@@ -15,8 +15,8 @@ android {
         applicationId "net.taler.merchantpos"
         minSdkVersion 21
         targetSdkVersion 32
-        versionCode 4
-        versionName "0.2.2"
+        versionCode 5
+        versionName "0.2.3"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
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 02f66fa..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
@@ -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(
@@ -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)
diff --git 
a/merchant-terminal/src/main/java/net/taler/merchantpos/payment/ProcessPaymentFragment.kt
 
b/merchant-terminal/src/main/java/net/taler/merchantpos/payment/ProcessPaymentFragment.kt
index 201c9cf..443ca91 100644
--- 
a/merchant-terminal/src/main/java/net/taler/merchantpos/payment/ProcessPaymentFragment.kt
+++ 
b/merchant-terminal/src/main/java/net/taler/merchantpos/payment/ProcessPaymentFragment.kt
@@ -55,9 +55,9 @@ class ProcessPaymentFragment : Fragment() {
         val introRes =
             if (hasNfc(requireContext())) R.string.payment_intro_nfc else 
R.string.payment_intro
         ui.payIntroView.setText(introRes)
-        paymentManager.payment.observe(viewLifecycleOwner, { payment ->
+        paymentManager.payment.observe(viewLifecycleOwner) { payment ->
             onPaymentStateChanged(payment)
-        })
+        }
         ui.cancelPaymentButton.setOnClickListener {
             onPaymentCancel()
         }

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