fixed credential screen lock from cart

Author: ajungg

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog  
 All notable changes to this project will be documented in this file.
 
+## [0.33.3]
+
+### Fixed
+- Require screen lock for payment methods that require credentials when calling from the shopping cart
 ## [0.33.2]
 
 ### Fixed

build.gradle

@@ -29,7 +29,7 @@ allprojects {
     }
 
     project.ext {
-        sdkVersion='0.33.2'
+        sdkVersion='0.33.3'
         versionCode=1
 
         compileSdkVersion=30

ui/src/main/java/io/snabble/sdk/ui/cart/ShoppingCartView.java

@@ -311,7 +311,7 @@ private void pay() {
             PaymentSelectionHelper.Entry entry = paymentSelectionHelper.getSelectedEntry().getValue();
             if (entry != null) {
                 if (entry.paymentMethod.isRequiringCredentials() && entry.paymentCredentials == null) {
-                    PaymentInputViewHelper.openPaymentInputView(entry.paymentMethod, project);
+                    PaymentInputViewHelper.openPaymentInputView(getContext(), entry.paymentMethod, project);
                 } else {
                     Telemetry.event(Telemetry.Event.ClickCheckout);
                     SEPALegalInfoHelper.showSEPALegalInfoIfNeeded(getContext(),

ui/src/main/java/io/snabble/sdk/ui/payment/PaymentInputViewHelper.java

@@ -1,39 +1,53 @@
 package io.snabble.sdk.ui.payment;
 
+import android.content.Context;
 import android.os.Bundle;
 
+import androidx.appcompat.app.AlertDialog;
+
 import io.snabble.sdk.PaymentMethod;
 import io.snabble.sdk.Project;
+import io.snabble.sdk.ui.R;
 import io.snabble.sdk.ui.SnabbleUI;
+import io.snabble.sdk.ui.utils.KeyguardUtils;
 
 public class PaymentInputViewHelper {
-    public static void openPaymentInputView(PaymentMethod paymentMethod, Project project) {
+    public static void openPaymentInputView(Context context, PaymentMethod paymentMethod, Project project) {
         SnabbleUI.Callback callback = SnabbleUI.getUiCallback();
         if (callback != null) {
-            Bundle args = new Bundle();
-            switch (paymentMethod) {
-                case VISA:
-                    args.putString(CreditCardInputView.ARG_PROJECT_ID, project.getId());
-                    args.putSerializable(CreditCardInputView.ARG_PAYMENT_TYPE, PaymentMethod.VISA);
-                    callback.execute(SnabbleUI.Action.SHOW_CREDIT_CARD_INPUT, args);
-                    break;
-                case AMEX:
-                    args.putString(CreditCardInputView.ARG_PROJECT_ID, project.getId());
-                    args.putSerializable(CreditCardInputView.ARG_PAYMENT_TYPE, PaymentMethod.AMEX);
-                    callback.execute(SnabbleUI.Action.SHOW_CREDIT_CARD_INPUT, args);
-                    break;
-                case MASTERCARD:
-                    args.putString(CreditCardInputView.ARG_PROJECT_ID, project.getId());
-                    args.putSerializable(CreditCardInputView.ARG_PAYMENT_TYPE, PaymentMethod.MASTERCARD);
-                    callback.execute(SnabbleUI.Action.SHOW_CREDIT_CARD_INPUT, args);
-                    break;
-                case PAYDIREKT:
-                    callback.execute(SnabbleUI.Action.SHOW_PAYDIREKT_INPUT, null);
-                    break;
-                case DE_DIRECT_DEBIT:
-                    callback.execute(SnabbleUI.Action.SHOW_SEPA_CARD_INPUT, null);
-                    break;
+            if (KeyguardUtils.isDeviceSecure()) {
+                Bundle args = new Bundle();
+                switch (paymentMethod) {
+                    case VISA:
+                        args.putString(CreditCardInputView.ARG_PROJECT_ID, project.getId());
+                        args.putSerializable(CreditCardInputView.ARG_PAYMENT_TYPE, PaymentMethod.VISA);
+                        callback.execute(SnabbleUI.Action.SHOW_CREDIT_CARD_INPUT, args);
+                        break;
+                    case AMEX:
+                        args.putString(CreditCardInputView.ARG_PROJECT_ID, project.getId());
+                        args.putSerializable(CreditCardInputView.ARG_PAYMENT_TYPE, PaymentMethod.AMEX);
+                        callback.execute(SnabbleUI.Action.SHOW_CREDIT_CARD_INPUT, args);
+                        break;
+                    case MASTERCARD:
+                        args.putString(CreditCardInputView.ARG_PROJECT_ID, project.getId());
+                        args.putSerializable(CreditCardInputView.ARG_PAYMENT_TYPE, PaymentMethod.MASTERCARD);
+                        callback.execute(SnabbleUI.Action.SHOW_CREDIT_CARD_INPUT, args);
+                        break;
+                    case PAYDIREKT:
+                        callback.execute(SnabbleUI.Action.SHOW_PAYDIREKT_INPUT, null);
+                        break;
+                    case DE_DIRECT_DEBIT:
+                        callback.execute(SnabbleUI.Action.SHOW_SEPA_CARD_INPUT, null);
+                        break;
+                }
+            } else {
+                new AlertDialog.Builder(context)
+                        .setMessage(R.string.Snabble_Keyguard_requireScreenLock)
+                        .setPositiveButton(R.string.Snabble_OK, null)
+                        .setCancelable(false)
+                        .show();
             }
+
         }
     }
 }