remove telecashDeDirectDebit in favor of support deDirectDebit, fix handling of no payment method case

Author: ajungg

CHANGELOG.md

@@ -1,6 +1,18 @@
 # Changelog  
 All notable changes to this project will be documented in this file.
 
+## [0.13.1]
+
+### Added
+- ScanIndicator has now Rectangle and Quadratic styles, via BarcodeScannerView.setIndicatorStyle
+
+### Changed
+- Improved BarcodeScannerView ScanIndicator
+- Removed support for 'teleCashDeDirectDebit' in favor of 'deDirectDebit' payment method
+
+### Fixed
+- Show error message when no payment method is available
+
 ## [0.13.0]
 
 ### Breaking Changes

build.gradle

@@ -23,7 +23,7 @@ allprojects {
     }
 
     project.ext {
-        sdkVersion='0.13.0'
+        sdkVersion='0.13.1'
         versionCode=1
 
         compileSdkVersion=28

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

@@ -57,19 +57,19 @@ public PaymentMethod[] getAvailablePaymentMethods(PaymentMethod[] clientAccepted
                             new TypeToken<List<PaymentMethod>>() {
                             }.getType());
 
-                    if (clientAcceptedPaymentMethods != null) {
-                        List<PaymentMethod> result = new ArrayList<>();
+                    if (clientAcceptedPaymentMethods == null) {
+                        clientAcceptedPaymentMethods = PaymentMethod.values();
+                    }
 
-                        for (PaymentMethod clientPaymentMethod : clientAcceptedPaymentMethods) {
-                            if (paymentMethods.contains(clientPaymentMethod)) {
-                                result.add(clientPaymentMethod);
-                            }
-                        }
+                    List<PaymentMethod> result = new ArrayList<>();
 
-                        return result.toArray(new PaymentMethod[result.size()]);
-                    } else {
-                        return paymentMethods.toArray(new PaymentMethod[paymentMethods.size()]);
+                    for (PaymentMethod clientPaymentMethod : clientAcceptedPaymentMethods) {
+                        if (paymentMethods.contains(clientPaymentMethod)) {
+                            result.add(clientPaymentMethod);
+                        }
                     }
+
+                    return result.toArray(new PaymentMethod[result.size()]);
                 }
             }
 

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

@@ -9,8 +9,8 @@ public enum PaymentMethod {
     ENCODED_CODES(true, false),
     @SerializedName("encodedCodesCSV")
     ENCODED_CODES_CSV(true, false),
-    @SerializedName("teleCashDeDirectDebit")
-    TELECASH_DIRECT_DEBIT(false, true);
+    @SerializedName("deDirectDebit")
+    DE_DIRECT_DEBIT(false, true);
 
     private boolean requiresCredentials;
     private boolean isOfflineMethod;

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

@@ -5,8 +5,7 @@
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.os.Handler;
-import android.os.Looper;
+
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import android.util.AttributeSet;
 import android.view.KeyEvent;
@@ -16,12 +15,9 @@
 import android.widget.ViewAnimator;
 
 import io.snabble.sdk.Checkout;
-import io.snabble.sdk.Snabble;
 import io.snabble.sdk.encodedcodes.EncodedCodesOptions;
-import io.snabble.sdk.ui.KeyguardHandler;
 import io.snabble.sdk.ui.R;
 import io.snabble.sdk.ui.SnabbleUI;
-import io.snabble.sdk.ui.SnabbleUICallback;
 import io.snabble.sdk.ui.utils.DelayedProgressDialog;
 import io.snabble.sdk.ui.utils.UIUtils;
 import io.snabble.sdk.utils.SimpleActivityLifecycleCallbacks;
@@ -111,7 +107,7 @@ public void onStateChanged(Checkout.State state) {
 
     private void displayPaymentView() {
         switch (checkout.getSelectedPaymentMethod()) {
-            case TELECASH_DIRECT_DEBIT:
+            case DE_DIRECT_DEBIT:
                 displayView(new CheckoutStatusView(getContext()));
                 break;
             case QRCODE_POS:

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

@@ -10,7 +10,6 @@
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import android.content.res.Resources;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.method.LinkMovementMethod;
@@ -53,7 +52,7 @@ class PaymentMethodView extends FrameLayout implements PaymentCredentialsStore.C
     private static Map<PaymentMethod, String> descriptions = new HashMap<>();
 
     static {
-        icons.put(PaymentMethod.TELECASH_DIRECT_DEBIT, R.drawable.ic_pm_sepa);
+        icons.put(PaymentMethod.DE_DIRECT_DEBIT, R.drawable.ic_pm_sepa);
         icons.put(PaymentMethod.QRCODE_POS, R.drawable.ic_pm_checkstand);
         icons.put(PaymentMethod.ENCODED_CODES, R.drawable.ic_pm_checkstand);
         icons.put(PaymentMethod.ENCODED_CODES_CSV, R.drawable.ic_pm_checkstand);
@@ -122,7 +121,7 @@ private void update() {
                 e.text = descriptions.get(paymentMethod);
                 e.paymentMethod = paymentMethod;
 
-                if(paymentMethod == PaymentMethod.TELECASH_DIRECT_DEBIT) {
+                if(paymentMethod == PaymentMethod.DE_DIRECT_DEBIT) {
                     e.onClickListener = new OnClickListener() {
                         @Override
                         public void onClick(View v) {
@@ -138,7 +137,7 @@ public void onClick(View v) {
         for(PaymentCredentials p : paymentCredentials) {
             if (p.getType() == PaymentCredentials.Type.SEPA) {
                 for(Entry e : entries) {
-                    if (e.paymentMethod == PaymentMethod.TELECASH_DIRECT_DEBIT) {
+                    if (e.paymentMethod == PaymentMethod.DE_DIRECT_DEBIT) {
                         entries.remove(e);
                         break;
                     }
@@ -147,9 +146,9 @@ public void onClick(View v) {
         }
 
         for(PaymentCredentials p : paymentCredentials) {
-            if (p.getType() == PaymentCredentials.Type.SEPA && availablePaymentMethods.contains(PaymentMethod.TELECASH_DIRECT_DEBIT)) {
+            if (p.getType() == PaymentCredentials.Type.SEPA && availablePaymentMethods.contains(PaymentMethod.DE_DIRECT_DEBIT)) {
                 Entry e = new Entry();
-                e.paymentMethod = PaymentMethod.TELECASH_DIRECT_DEBIT;
+                e.paymentMethod = PaymentMethod.DE_DIRECT_DEBIT;
                 e.paymentCredentials = p;
                 e.text = p.getObfuscatedId();
                 entries.add(e);
@@ -172,7 +171,7 @@ private void showSEPACardInput() {
     }
 
     private void showSEPALegalInfoIfNeeded(final PaymentMethod paymentMethod, final OnClickListener clickListener) {
-        if (paymentMethod != PaymentMethod.TELECASH_DIRECT_DEBIT) {
+        if (paymentMethod != PaymentMethod.DE_DIRECT_DEBIT) {
             clickListener.onClick(null);
             return;
         }