From a548396c4c028901e0dbc5a30ddfd5d3c4c4380a Mon Sep 17 00:00:00 2001 From: Adyen-GIT-Manager Date: Thu, 24 May 2018 17:46:26 +0200 Subject: [PATCH] Release 1.14.2 --- README.md | 13 +++++++-- adyen-ui/proguard-rules.pro | 3 ++ .../ui/fragments/CreditCardFragment.java | 3 ++ .../main/res/layout/credit_card_fragment.xml | 2 +- build.gradle | 4 +-- checkoutdemo/build.gradle | 6 ++-- checkoutdemo/proguard-rules.pro | 28 +++++++++++++++++++ customuiapplication/build.gradle | 5 ++-- customuiapplication/proguard-rules.pro | 11 ++++++++ customwithcheckoutui/build.gradle | 15 ++++++---- customwithcheckoutui/proguard-rules.pro | 3 ++ defaultApp/build.gradle | 7 +++-- defaultApp/proguard-rules.pro | 11 ++++++++ 13 files changed, 94 insertions(+), 17 deletions(-) create mode 100644 checkoutdemo/proguard-rules.pro diff --git a/README.md b/README.md index 64ffeee8b9..037638eb33 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Adyen SDK for Android Want to add a checkout to your Android app? No matter if your shopper wants to pay with a card (optionally with 3D Secure & One-click), wallet or a local payment method – all can be integrated in the same way, using the Adyen SDK. The Adyen SDK enrypts sensitive card data and sends it directly to Adyen, to keep your PCI scope limited. -This README provides the usage manual for the SDK itself. For the full documentation, including the server side implementation guidelines, refer to https://docs.adyen.com/developers/in-app-integration-guide. +This README provides the usage manual for the SDK itself. For the full documentation, including the server side implementation guidelines, refer to https://docs.adyen.com/developers/checkout/android. ## Installation To integrate the Adyen SDK into your project, import the **core**, **utils** and **ui** module by adding the following lines to your build.gradle file. @@ -181,9 +181,18 @@ For your convenience, we included the following demo modules into this repositor * **customwithcheckoutui** – An experimental module where the Custom integration is used with UI elements (fragments, views) from the Checkout UI. +## Proguard Rules + +If you are using the Quick integration together with Proguard you need to add the following rules: + +``` +-keep public class com.adyen.ui.DefaultPaymentRequestListener {*;} +-keep public class com.adyen.ui.DefaultPaymentRequestDetailsListener {*;} +``` + ## See also - * [Complete Documentation](https://docs.adyen.com/developers/in-app-integration?platform=inapp-android) + * [Complete Documentation](https://docs.adyen.com/developers/checkout/android) * [SDK Reference](https://adyen.github.io/adyen-android/) diff --git a/adyen-ui/proguard-rules.pro b/adyen-ui/proguard-rules.pro index 6ed28974e3..ae023e513a 100644 --- a/adyen-ui/proguard-rules.pro +++ b/adyen-ui/proguard-rules.pro @@ -23,3 +23,6 @@ # If you keep the line number information, uncomment this to # hide the original source file name. #-renamesourcefileattribute SourceFile + +-keep public class com.adyen.ui.DefaultPaymentRequestListener {*;} +-keep public class com.adyen.ui.DefaultPaymentRequestDetailsListener {*;} diff --git a/adyen-ui/src/main/java/com/adyen/ui/fragments/CreditCardFragment.java b/adyen-ui/src/main/java/com/adyen/ui/fragments/CreditCardFragment.java index e42a5d4bde..0f684e98a7 100644 --- a/adyen-ui/src/main/java/com/adyen/ui/fragments/CreditCardFragment.java +++ b/adyen-ui/src/main/java/com/adyen/ui/fragments/CreditCardFragment.java @@ -73,6 +73,7 @@ public class CreditCardFragment extends Fragment implements CreditCardEditText.C private boolean oneClick; private boolean nameRequired; private boolean storeDetailsOptionAvailable; + private boolean storeDetailsOptionChecked; private Amount amount; private String shopperReference; private PaymentMethod paymentMethod; @@ -134,6 +135,7 @@ public void setArguments(final Bundle args) { } if (inputDetail.getKey().equals("storeDetails")) { storeDetailsOptionAvailable = true; + storeDetailsOptionChecked = "true".equals(inputDetail.getValue()) ? true : false; } } @@ -313,6 +315,7 @@ public void onReadyStateChanged(boolean isReady) { } saveCardCheckBox = (CheckoutCheckBox) fragmentView.findViewById(R.id.save_card_checkbox); + saveCardCheckBox.setChecked(storeDetailsOptionChecked); if (!StringUtils.isEmptyOrNull(shopperReference) && storeDetailsOptionAvailable) { fragmentView.findViewById(R.id.layout_save_card).setVisibility(VISIBLE); fragmentView.findViewById(R.id.layout_click_area_save_card).setOnClickListener(new View.OnClickListener() { diff --git a/adyen-ui/src/main/res/layout/credit_card_fragment.xml b/adyen-ui/src/main/res/layout/credit_card_fragment.xml index aa3c4be730..80e3dabd25 100644 --- a/adyen-ui/src/main/res/layout/credit_card_fragment.xml +++ b/adyen-ui/src/main/res/layout/credit_card_fragment.xml @@ -240,7 +240,7 @@ android:layout_height="wrap_content" />