Automatically abort payment proposals when backing out of payment

1 files changed, 8 insertions, 6 deletions

diff --git a/app/src/main/java/net/taler/wallet/payment/PromptPaymentFragment.kt b/app/src/main/java/net/taler/wallet/payment/PromptPaymentFragment.kt
index d623788..e8fe6db 100644
--- a/app/src/main/java/net/taler/wallet/payment/PromptPaymentFragment.kt
+++ b/app/src/main/java/net/taler/wallet/payment/PromptPaymentFragment.kt
@@ -70,16 +70,18 @@ class PromptPaymentFragment : Fragment() {
         }
 
         button_abort_payment.setOnClickListener {
-            when (val ps = paymentManager.payStatus.value) {
-                is PayStatus.Prepared -> {
-                    paymentManager.abortProposal(ps.proposalId)
-                }
-            }
-            paymentManager.resetPayStatus()
+            paymentManager.abortPay()
             findNavController().navigateUp()
         }
     }
 
+    override fun onDestroy() {
+        super.onDestroy()
+        if (!requireActivity().isChangingConfigurations) {
+            paymentManager.abortPay()
+        }
+    }
+
     private fun showLoading(show: Boolean) {
         model.showProgressBar.value = show
     }