Skip to content

Commit

Permalink
Release 1.14.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Adyen-GIT-Manager committed May 24, 2018
1 parent b5fed2e commit a548396
Show file tree
Hide file tree
Showing 13 changed files with 94 additions and 17 deletions.
13 changes: 11 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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/)

Expand Down
3 changes: 3 additions & 0 deletions adyen-ui/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -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 {*;}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -134,6 +135,7 @@ public void setArguments(final Bundle args) {
}
if (inputDetail.getKey().equals("storeDetails")) {
storeDetailsOptionAvailable = true;
storeDetailsOptionChecked = "true".equals(inputDetail.getValue()) ? true : false;
}
}

Expand Down Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion adyen-ui/src/main/res/layout/credit_card_fragment.xml
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@
android:layout_height="wrap_content" />

<com.adyen.ui.views.CheckoutCheckBox
android:checked="true"
android:checked="false"
android:gravity="center"
android:layout_gravity="center"
android:id="@+id/save_card_checkbox"
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ ext {

minSdkVersion = 16
targetSdkVersion = 25
versionCode = 18
versionName = "1.14.1"
versionCode = 19
versionName = "1.14.2"

release_debuggable = false
release_minifyEnabled = false
Expand Down
6 changes: 4 additions & 2 deletions checkoutdemo/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,10 @@ android {
}
buildTypes {
release {
debuggable rootProject.release_debuggable
minifyEnabled rootProject.release_minifyEnabled
debuggable false
minifyEnabled false
shrinkResources false
useProguard false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
debug {
Expand Down
28 changes: 28 additions & 0 deletions checkoutdemo/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# Add project specific ProGuard rules here.
# By default, the flags in this file are appended to flags specified
# in /Users/emred/Library/Android/sdk/tools/proguard/proguard-android.txt
# You can edit the include path and order by changing the proguardFiles
# directive in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html

# Add any project specific keep options here:

# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}

# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable

# 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 {*;}
5 changes: 3 additions & 2 deletions customuiapplication/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@ android {
}
buildTypes {
release {
debuggable rootProject.release_debuggable
minifyEnabled rootProject.release_minifyEnabled
debuggable false
minifyEnabled false
shrinkResources false
useProguard false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
debug {
Expand Down
11 changes: 11 additions & 0 deletions customuiapplication/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,14 @@
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}

# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable

# 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 {*;}
15 changes: 9 additions & 6 deletions customwithcheckoutui/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ android {

defaultConfig {
applicationId "com.example.customwithadyenui"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode rootProject.ext.versionCode
versionName rootProject.ext.versionName
minSdkVersion rootProject.minSdkVersion
targetSdkVersion rootProject.targetSdkVersion
versionCode rootProject.versionCode
versionName rootProject.versionName

testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

Expand All @@ -19,12 +19,15 @@ android {
}
buildTypes {
release {
debuggable false
minifyEnabled false
shrinkResources false
useProguard false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
debug {
debuggable rootProject.ext.debug_debuggable
testCoverageEnabled = rootProject.ext.debug_testCoverageEnabled
debuggable rootProject.debug_debuggable
testCoverageEnabled = rootProject.debug_testCoverageEnabled
}
}
}
Expand Down
3 changes: 3 additions & 0 deletions customwithcheckoutui/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -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 {*;}
7 changes: 5 additions & 2 deletions defaultApp/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ android {
targetSdkVersion rootProject.targetSdkVersion
versionCode rootProject.versionCode
versionName rootProject.versionName

testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

buildConfigField "String", "SERVER_URL", "\"" + System.getProperty("SERVER_URL", "").trim() + "\""
Expand All @@ -18,8 +19,10 @@ android {
}
buildTypes {
release {
debuggable rootProject.release_debuggable
minifyEnabled rootProject.release_minifyEnabled
debuggable false
minifyEnabled false
shrinkResources false
useProguard false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
debug {
Expand Down
11 changes: 11 additions & 0 deletions defaultApp/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,14 @@
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}

# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable

# 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 {*;}

0 comments on commit a548396

Please sign in to comment.