improve sepa mandate dialog & fixed mandate dialog not showing when keyguard is not configured

Author: ajungg

CHANGELOG.md

@@ -3,8 +3,12 @@ All notable changes to this project will be documented in this file.
 
 ## [0.13.12]
 
+### Changed
+- Improved SEPA mandate info dialog
+
 ### Fixed
 - Now correctly escaping line feeds in product queries 
+- Fixed SEPA mandate dialog not showing when credentials were not encrypted using a keyguard
 
 ## [0.13.11]
 

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

@@ -309,13 +309,13 @@ public void onBindViewHolder(final PaymentMethodView.ViewHolder holder, final in
                 holder.card.setOnClickListener(new OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                        if(Snabble.getInstance().getUserPreferences().isRequiringKeyguardAuthenticationForPayment()
-                                && e.paymentMethod.isRequiringCredentials()) {
-                            showSEPALegalInfoIfNeeded(e.paymentMethod, new OnClickListener() {
-                                @Override
-                                public void onClick(View v) {
-                                    final SnabbleUICallback callback = SnabbleUI.getUiCallback();
-                                    if (callback != null) {
+                        showSEPALegalInfoIfNeeded(e.paymentMethod, new OnClickListener() {
+                            @Override
+                            public void onClick(View v) {
+                                final SnabbleUICallback callback = SnabbleUI.getUiCallback();
+                                if (callback != null) {
+                                    if(Snabble.getInstance().getUserPreferences().isRequiringKeyguardAuthenticationForPayment()
+                                            && e.paymentMethod.isRequiringCredentials()) {
                                         callback.requestKeyguard(new KeyguardHandler() {
                                             @Override
                                             public void onKeyguardResult(int resultCode) {
@@ -327,13 +327,13 @@ public void onKeyguardResult(int resultCode) {
                                                 }
                                             }
                                         });
+                                    } else {
+                                        checkout.pay(e.paymentMethod, e.paymentCredentials);
+                                        Telemetry.event(Telemetry.Event.SelectedPaymentMethod, e.paymentMethod);
                                     }
                                 }
-                            });
-                        } else {
-                            checkout.pay(e.paymentMethod, e.paymentCredentials);
-                            Telemetry.event(Telemetry.Event.SelectedPaymentMethod, e.paymentMethod);
-                        }
+                            }
+                        });
                     }
                 });
             }

ui/src/main/res/layout/dialog_sepa_legal_info.xml

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_gravity="bottom"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="wrap_content"
+    android:paddingLeft="24dp"
+    android:paddingRight="24dp"
+    android:paddingBottom="20dp">
     <LinearLayout
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="center"
-        android:paddingLeft="24dp"
-        android:paddingRight="24dp"
-        android:paddingBottom="20dp">
+        android:paddingBottom="72dp"
+        android:gravity="center" >
         <ImageView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -29,20 +29,25 @@
             android:textStyle="bold"
             android:text="@string/Snabble.Payment.SEPA.legalInfo.title"/>
 
-        <TextView
-            android:id="@+id/message"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:layout_marginTop="8dp"
-            android:textSize="13sp"
-            tools:text="Ich ermächtige Lebensmittelmärkte snabble GmbH, einmalig eine Zahlung von meinem Konto mittels Lastschrift einzuziehen."/>
-
-        <Button style="@style/SnabbleButton"
+        <ScrollView
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="24dp"
-            android:id="@+id/button"
-            android:text="@string/Snabble.Payment.SEPA.legalInfo.agree" />
+            android:layout_height="match_parent"
+            android:layout_marginTop="8dp">
+            <TextView
+                android:id="@+id/message"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:textSize="13sp"
+                tools:text="Ich ermächtige Lebensmittelmärkte snabble GmbH, einmalig eine Zahlung von meinem Konto mittels Lastschrift einzuziehen."/>
+        </ScrollView>
     </LinearLayout>
-</ScrollView>
+
+    <Button style="@style/SnabbleButton"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:layout_gravity="bottom"
+        android:id="@+id/button"
+        android:text="@string/Snabble.Payment.SEPA.legalInfo.agree" />
+</FrameLayout>