execute pending checkouts, prepare 0.16.0-beta1

Author: ajungg

CHANGELOG.md

@@ -1,13 +1,26 @@
 # Changelog  
 All notable changes to this project will be documented in this file.
 
+## [0.16.0-beta1]
+
+### Breaking Changes
+- Added showCreditCardInput() to SnabbleUICallback. If you don't use credit card payments, you
+can leave the implementation empty.
+
+### Added
+- Experimental support for credit card payments. To enable set Config.enableExperimentalCreditCardPayment.
+Only supported on API 21+.
+
+- Checkouts are now persisted and will be transferred at a later time.
+- Now always showing a payment method selection when entering a new payment method.
+
 ## [0.15.3]
 
 ### Added
 - ProductNotFound events are now posted when a scanned product is not found 
 
 ### Changed
-- ReceiptInfo.getDate() is now deprecated, use getTimestamp instead.
+- ReceiptInfo.getDate() is now deprecated, use getTimestamp() instead.
 
 ## [0.15.2]
 

build.gradle

@@ -23,7 +23,7 @@ allprojects {
     }
 
     project.ext {
-        sdkVersion='0.15.3'
+        sdkVersion='0.16.0-beta1'
         versionCode=1
 
         compileSdkVersion=28

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

@@ -514,7 +514,7 @@ public String getQRCodePOSContent() {
     }
 
     public void processPendingCheckouts() {
-
+        checkoutRetryer.processPendingCheckouts();
     }
 
     /**

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

@@ -48,7 +48,7 @@ private class SavedCart {
             savedCarts = new CopyOnWriteArrayList<>();
         }
 
-        processSavedCheckouts();
+        processPendingCheckouts();
     }
 
     public void add(ShoppingCart.BackendCart backendCart) {
@@ -64,7 +64,7 @@ private void save() {
                 .apply();
     }
 
-    public void processSavedCheckouts() {
+    public void processPendingCheckouts() {
         handler.post(new Runnable() {
             @Override
             public void run() {

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

@@ -1,9 +1,16 @@
 package io.snabble.sdk;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.Application;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
 import android.util.Base64;
 
 import com.google.gson.JsonArray;
@@ -132,6 +139,7 @@ protected void onError() {
         }
 
         app.registerActivityLifecycleCallbacks(activityLifecycleCallbacks);
+        app.registerReceiver(networkChangeReceiver, new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION));
     }
 
     public String getVersionName() {
@@ -385,7 +393,7 @@ private void checkCartTimeouts() {
         }
     }
 
-    private void processSavedCheckouts() {
+    private void processPendingCheckouts() {
         for (Project project : projects) {
             project.getCheckout().processPendingCheckouts();
         }
@@ -414,9 +422,29 @@ public interface OnMetadataUpdateListener {
         public void onActivityStarted(Activity activity) {
             updateMetadata();
             checkCartTimeouts();
+            processPendingCheckouts();
         }
     };
 
+    @SuppressLint("MissingPermission")
+    private BroadcastReceiver networkChangeReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+
+            NetworkInfo activeNetwork = cm.getActiveNetworkInfo();
+            if (activeNetwork != null) {
+                onConnectionStateChanged(activeNetwork.isConnected());
+            }
+        }
+    };
+
+    private void onConnectionStateChanged(boolean isConnected) {
+        if (isConnected) {
+            processPendingCheckouts();
+        }
+    }
+
     /**
      * Enables debug logging.
      */

ui/src/main/java/io/snabble/sdk/ui/checkout/CheckoutView.java

@@ -15,8 +15,6 @@
 import android.widget.ViewAnimator;
 
 import io.snabble.sdk.Checkout;
-import io.snabble.sdk.Project;
-import io.snabble.sdk.encodedcodes.EncodedCodesOptions;
 import io.snabble.sdk.ui.R;
 import io.snabble.sdk.ui.SnabbleUI;
 import io.snabble.sdk.ui.telemetry.Telemetry;

ui/src/main/java/io/snabble/sdk/ui/checkout/PaymentMethodView.java

@@ -191,8 +191,13 @@ public void onClick(View v) {
                             };
                             break;
                         default:
-                            checkout.pay(e.paymentMethod, e.paymentCredentials);
-                            Telemetry.event(Telemetry.Event.SelectedPaymentMethod, e.paymentMethod);
+                            e.onClickListener = new OnClickListener() {
+                                @Override
+                                public void onClick(View v) {
+                                    checkout.pay(e.paymentMethod, e.paymentCredentials);
+                                    Telemetry.event(Telemetry.Event.SelectedPaymentMethod, e.paymentMethod);
+                                }
+                            };
                             break;
                     }