taler-android

commit fa1bb88a316c56d36735883b1a46bdba1f108ee2
parent 5b2bf9f0fc4487d3801722b649cf7cb854074132
Author: Iván Ávalos <avalos@disroot.org>
Date:   Wed, 11 Sep 2024 14:05:46 +0200

[pos] do not show error on cancel order and always hide password

Diffstat:
M
merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigFragment.kt
 | 
8
--------
M
merchant-terminal/src/main/java/net/taler/merchantpos/payment/PaymentManager.kt
 | 
2
+-
M
merchant-terminal/src/main/java/net/taler/merchantpos/payment/ProcessPaymentFragment.kt
 | 
4
++--

3 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigFragment.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigFragment.kt
@@ -167,10 +167,6 @@ class ConfigFragment : Fragment() {
                         ui.usernameView.editText!!.setText(config.username)
                     }
 
-                    if (config.password.isNotBlank() && config.savePassword) {
-                        ui.passwordView.editText!!.setText(config.password)
-                    }
-
                     ui.savePasswordCheckBox.isChecked = config.savePassword
                 }
 
@@ -179,10 +175,6 @@ class ConfigFragment : Fragment() {
                         ui.merchantUrlView.editText!!.setText(config.merchantUrl)
                     }
 
-                    if (config.accessToken.isNotBlank() && config.savePassword) {
-                        ui.tokenView.editText!!.setText(config.accessToken)
-                    }
-
                     ui.saveTokenCheckBox.isChecked = config.savePassword
                 }
             }
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
@@ -113,7 +113,7 @@ class PaymentManager(
     }
 
     @UiThread
-    fun cancelPayment(error: String) {
+    fun cancelPayment(error: String? = null) {
         // delete unpaid order
         val merchantConfig = configManager.merchantConfig!!
         mPayment.value?.let { payment ->
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
@@ -67,7 +67,7 @@ class ProcessPaymentFragment : Fragment() {
 
     override fun onDestroy() {
         super.onDestroy()
-        paymentManager.cancelPayment(getString(R.string.error_cancelled))
+        paymentManager.cancelPayment()
     }
 
     private fun onPaymentStateChanged(payment: Payment) {
@@ -106,7 +106,7 @@ class ProcessPaymentFragment : Fragment() {
     }
 
     private fun onPaymentCancel() {
-        paymentManager.cancelPayment(getString(R.string.error_cancelled))
+        paymentManager.cancelPayment()
         findNavController().navigateUp()
         Snackbar.make(requireView(), R.string.payment_canceled, LENGTH_LONG).show()
     }