fix abort from cart when already processing

Author: ajungg

CHANGELOG.md

@@ -1,6 +1,11 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [0.49.3]
+
+### Fixed 
+- Transaction can now not be aborted anymore when already processing and user is still in cart
+
 ## [0.49.2]
 
 ### Fixed

build.gradle

@@ -31,7 +31,7 @@ allprojects {
     }
 
     project.ext {
-        sdkVersion='0.49.2'
+        sdkVersion='0.49.3'
         versionCode=1
 
         compileSdkVersion=31

core/src/main/java/io/snabble/sdk/Checkout.java

@@ -169,8 +169,10 @@ public void success() {
                             notifyStateChanged(Checkout.State.PAYMENT_ABORTED);
                         }
 
+                        stopPolling();
                         invalidProducts = null;
                         paymentMethod = null;
+
                         shoppingCart.generateNewUUID();
                         shop = null;
                     }
@@ -181,7 +183,9 @@ public void error() {
                     if (error) {
                         notifyStateChanged(Checkout.State.PAYMENT_PROCESSING_ERROR);
                     } else {
-                        notifyStateChanged(Checkout.State.PAYMENT_ABORT_FAILED);
+                        if (state != State.PAYMENT_PROCESSING && state != State.PAYMENT_APPROVED) {
+                            notifyStateChanged(Checkout.State.PAYMENT_ABORT_FAILED);
+                        }
                     }
                 }
             });
@@ -209,7 +213,6 @@ public void abortSilently() {
 
     public void cancelOutstandingCalls() {
         checkoutApi.cancel();
-        stopPolling();
     }
 
     /**
@@ -219,6 +222,7 @@ public void cancelOutstandingCalls() {
      */
     public void reset() {
         cancelOutstandingCalls();
+        stopPolling();
         notifyStateChanged(Checkout.State.NONE);
 
         invalidProducts = null;

ui/src/main/java/io/snabble/sdk/ui/cart/CheckoutBar.kt

@@ -102,11 +102,10 @@ open class CheckoutBar @JvmOverloads constructor(
         progressDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER)
         progressDialog.setMessage(context.getString(R.string.Snabble_pleaseWait))
         progressDialog.setCanceledOnTouchOutside(false)
-        progressDialog.setCancelable(true)
+        progressDialog.setCancelable(false)
         progressDialog.setOnKeyListener(DialogInterface.OnKeyListener { dialogInterface: DialogInterface, _, keyEvent: KeyEvent ->
             if (keyEvent.keyCode == KeyEvent.KEYCODE_BACK) {
                 project.checkout.abort()
-                dialogInterface.dismiss()
                 return@OnKeyListener true
             }
             false