2.1.0

Adyen · Oct 16, 2018 · e45b127 · e45b127
1 parent fb2ac94
commit e45b127
Show file tree

Hide file tree

Showing 38 changed files with 558 additions and 118 deletions.
diff --git a/README.md b/README.md
@@ -18,9 +18,10 @@ To give you as much flexibility as possible, our Android SDK can be integrated i
 Import the quick integration modules by adding these lines to your build.gradle file.
 
 ```groovy
-final checkoutVersion = "2.0.3"
+final checkoutVersion = "2.1.0"
 implementation "com.adyen.checkout:ui:${checkoutVersion}"
 implementation "com.adyen.checkout:nfc:${checkoutVersion}" // Optional; Integrates NFC card reader in card UI
+implementation "com.adyen.checkout:wechatpay:${checkoutVersion}" // Optional; Integrates support for WeChat Pay
 ```
 
 #### Getting started
@@ -135,7 +136,7 @@ By default, we use the font that is declared in the theme that is used for check
 #### Installation
 Import the following modules by adding these line to your `build.gradle` file.
 ```groovy
-final checkoutVersion = "2.0.3"
+final checkoutVersion = "2.1.0"
 implementation "com.adyen.checkout:core:${checkoutVersion}"
 implementation "com.adyen.checkout:core-card:${checkoutVersion}" // Optional; Required for processing card payments.
 implementation "com.adyen.checkout:nfc:${checkoutVersion}" // Optional; Enables reading of card information with the device"s NFC chip.

diff --git a/build.gradle b/build.gradle
@@ -3,13 +3,11 @@ ext {
     targetSdkVersion = 27
     minSdkVersion = 16
 
-    buildToolsVersion = "27.0.3"
-
     supportLibVersion = "27.1.1"
     roomVersion = "1.1.1"
     lifecycleVersion = "1.1.1"
     playServicesWalletVersion = "15.0.1"
-    weChatPayVersion = "5.1.4"
+    weChatPayVersion = "5.1.6"
     adyenCseVersion = "1.0.5"
 
     espressoVersion = "3.0.1"
@@ -27,11 +25,11 @@ ext {
             "com.android.support:recyclerview-v7:619f39f296cbecda5c3ffdd861d78f60:MD5",
             "com.android.support:customtabs:5a282babea31b0081fd45887c76b4976:MD5",
             "com.android.support:design:481deb2f8b4451e322d52ecdb9224cf4:MD5",
-            "com.tencent.mm.opensdk:wechat-sdk-android-without-mta:aff8bb92f98aa96792b984e51982fb35a8562c7cdeec270a3f163384f37bf87b:SHA-256",
+            "com.tencent.mm.opensdk:wechat-sdk-android-without-mta:9a15154c07c05eadba8351c110647c1754316e32d8f12f55e24679891b52739c:SHA-256",
     ]
 
-    versionCode = 203
-    versionName = "2.0.3"
+    versionCode = 204
+    versionName = "2.1.0"
 
     testCoverageEnabled = true
 }
@@ -42,7 +40,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:3.1.3"
+        classpath "com.android.tools.build:gradle:3.2.0"
         classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.2"
     }
 }

diff --git a/checkout-base/build.gradle b/checkout-base/build.gradle
@@ -7,7 +7,6 @@ apply from: "$rootProject.rootDir/release.gradle"
 
 android {
     compileSdkVersion rootProject.compileSdkVersion
-    buildToolsVersion rootProject.buildToolsVersion
 
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion

diff --git a/checkout-core-card/build.gradle b/checkout-core-card/build.gradle
@@ -7,7 +7,6 @@ apply from: "$rootProject.rootDir/release.gradle"
 
 android {
     compileSdkVersion rootProject.compileSdkVersion
-    buildToolsVersion rootProject.buildToolsVersion
 
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion

diff --git a/checkout-core/build.gradle b/checkout-core/build.gradle
@@ -7,7 +7,6 @@ apply from: "$rootProject.rootDir/release.gradle"
 
 android {
     compileSdkVersion rootProject.compileSdkVersion
-    buildToolsVersion rootProject.buildToolsVersion
 
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion

diff --git a/checkout-googlewallet/build.gradle b/checkout-googlewallet/build.gradle
@@ -7,7 +7,6 @@ apply from: "$rootProject.rootDir/quality.gradle"
 
 android {
     compileSdkVersion rootProject.compileSdkVersion
-    buildToolsVersion rootProject.buildToolsVersion
 
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion

diff --git a/checkout-nfc/build.gradle b/checkout-nfc/build.gradle
@@ -7,7 +7,6 @@ apply from: "$rootProject.rootDir/release.gradle"
 
 android {
     compileSdkVersion rootProject.compileSdkVersion
-    buildToolsVersion rootProject.buildToolsVersion
 
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion

diff --git a/checkout-ui/build.gradle b/checkout-ui/build.gradle
@@ -7,7 +7,6 @@ apply from: "$rootProject.rootDir/release.gradle"
 
 android {
     compileSdkVersion rootProject.compileSdkVersion
-    buildToolsVersion rootProject.buildToolsVersion
 
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion

diff --git a/...src/main/java/com/adyen/checkout/ui/internal/common/activity/RedirectHandlerActivity.java b/...src/main/java/com/adyen/checkout/ui/internal/common/activity/RedirectHandlerActivity.java
@@ -12,6 +12,7 @@
 import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.ProgressBar;
+import android.widget.Toast;
 
 import com.adyen.checkout.core.PaymentHandler;
 import com.adyen.checkout.core.PaymentReference;
@@ -87,7 +88,13 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         if (savedInstanceState == null) {
             RedirectDetails redirectDetails = getIntent().getParcelableExtra(EXTRA_REDIRECT_DETAILS);
             Intent redirectIntent = createRedirectIntent(redirectDetails.getUri());
-            startActivityForResult(redirectIntent, REQUEST_CODE_REDIRECT);
+
+            if (redirectIntent.resolveActivity(getPackageManager()) != null) {
+                startActivityForResult(redirectIntent, REQUEST_CODE_REDIRECT);
+            } else {
+                Toast.makeText(getApplicationContext(), R.string.checkout_error_redirect_failed, Toast.LENGTH_LONG).show();
+                finish();
+            }
         }
     }
 

diff --git a/...t-ui/src/main/java/com/adyen/checkout/ui/internal/picker/CheckoutMethodPickerAdapter.java b/...t-ui/src/main/java/com/adyen/checkout/ui/internal/picker/CheckoutMethodPickerAdapter.java
@@ -107,6 +107,7 @@ public void onBindViewHolder(@NonNull TwoLineItemViewHolder holder, int position
         checkoutMethod.buildLogoRequestArgs(mLogoApi).into(mLifecycleOwner, holder, holder.getLogoImageView());
         holder.setPrimaryText(checkoutMethod.getPrimaryText());
         holder.setSecondaryText(checkoutMethod.getSecondaryText());
+        holder.itemView.setTag(checkoutMethod.getPaymentMethod().getType());
     }
 
     @Override

diff --git a/checkout-ui/src/main/res/values-da-rDK/strings.xml b/checkout-ui/src/main/res/values-da-rDK/strings.xml
@@ -13,6 +13,7 @@
     <string name="checkout_one_click_delete_confirmation_message">Slet betalingsmåde %s?</string>
     <string name="checkout_one_click_delete">Slet</string>
     <string name="checkout_error_dialog_title">Fejl</string>
+    <string name="checkout_error_redirect_failed">Omdirigering fejlede</string>
     <string name="checkout_ok">OK</string>
     <string name="checkout_skip">Spring over</string>
 

diff --git a/checkout-ui/src/main/res/values-de-rDE/strings.xml b/checkout-ui/src/main/res/values-de-rDE/strings.xml
@@ -13,6 +13,7 @@
     <string name="checkout_one_click_delete_confirmation_message">Zahlungsmethode %s entfernen?</string>
     <string name="checkout_one_click_delete">Entfernen</string>
     <string name="checkout_error_dialog_title">Fehler</string>
+    <string name="checkout_error_redirect_failed">Weiterleitung fehlgeschlagen</string>
     <string name="checkout_ok">OK</string>
     <string name="checkout_skip">Überspringen</string>
 

diff --git a/checkout-ui/src/main/res/values-es-rES/strings.xml b/checkout-ui/src/main/res/values-es-rES/strings.xml
@@ -13,6 +13,7 @@
     <string name="checkout_one_click_delete_confirmation_message">¿Desea eliminar el método de pago %s?</string>
     <string name="checkout_one_click_delete">Eliminar</string>
     <string name="checkout_error_dialog_title">Error</string>
+    <string name="checkout_error_redirect_failed">Redirección fallida</string>
     <string name="checkout_ok">Okay</string>
     <string name="checkout_skip">Omitir</string>
 

diff --git a/checkout-ui/src/main/res/values-fr-rFR/strings.xml b/checkout-ui/src/main/res/values-fr-rFR/strings.xml
@@ -13,6 +13,7 @@
     <string name="checkout_one_click_delete_confirmation_message">Supprimer le mode de paiement %s ?</string>
     <string name="checkout_one_click_delete">Supprimer</string>
     <string name="checkout_error_dialog_title">Erreur</string>
+    <string name="checkout_error_redirect_failed">Échec de la redirection</string>
     <string name="checkout_ok">OK</string>
     <string name="checkout_skip">Ignorer</string>
 

diff --git a/checkout-ui/src/main/res/values-it-rIT/strings.xml b/checkout-ui/src/main/res/values-it-rIT/strings.xml
@@ -13,6 +13,7 @@
     <string name="checkout_one_click_delete_confirmation_message">Eliminare il metodo di pagamento %s?</string>
     <string name="checkout_one_click_delete">Cancella</string>
     <string name="checkout_error_dialog_title">Errore</string>
+    <string name="checkout_error_redirect_failed">Reindirizzamento non riuscito</string>
     <string name="checkout_ok">OK</string>
     <string name="checkout_skip">Salta</string>
 

diff --git a/checkout-ui/src/main/res/values-nb-rNO/strings.xml b/checkout-ui/src/main/res/values-nb-rNO/strings.xml
@@ -13,6 +13,7 @@
     <string name="checkout_one_click_delete_confirmation_message">Slette betalingsmetoden %s?</string>
     <string name="checkout_one_click_delete">Slett</string>
     <string name="checkout_error_dialog_title">Feil</string>
+    <string name="checkout_error_redirect_failed">Videresending feilet</string>
     <string name="checkout_ok">Ok</string>
     <string name="checkout_skip">Hopp over</string>
 

diff --git a/checkout-ui/src/main/res/values-nl-rNL/strings.xml b/checkout-ui/src/main/res/values-nl-rNL/strings.xml
@@ -13,6 +13,7 @@
     <string name="checkout_one_click_delete_confirmation_message">Betalingsmethode %s verwijderen?</string>
     <string name="checkout_one_click_delete">Verwijderen</string>
     <string name="checkout_error_dialog_title">Fout</string>
+    <string name="checkout_error_redirect_failed">Doorsturen niet gelukt</string>
     <string name="checkout_ok">Oké</string>
     <string name="checkout_skip">Overslaan</string>
 

diff --git a/checkout-ui/src/main/res/values-pl-rPL/strings.xml b/checkout-ui/src/main/res/values-pl-rPL/strings.xml
@@ -13,6 +13,7 @@
     <string name="checkout_one_click_delete_confirmation_message">Usunąć metodę płatności %s?</string>
     <string name="checkout_one_click_delete">Usuń</string>
     <string name="checkout_error_dialog_title">Błąd</string>
+    <string name="checkout_error_redirect_failed">Przekierowanie nie powiodło się</string>
     <string name="checkout_ok">Ok</string>
     <string name="checkout_skip">Pomiń</string>
 

diff --git a/checkout-ui/src/main/res/values-pt-rBR/strings.xml b/checkout-ui/src/main/res/values-pt-rBR/strings.xml
@@ -13,6 +13,7 @@
     <string name="checkout_one_click_delete_confirmation_message">Excluir métodos de pagamento %s?</string>
     <string name="checkout_one_click_delete">Excluir</string>
     <string name="checkout_error_dialog_title">Erro</string>
+    <string name="checkout_error_redirect_failed">Falha no redirecionamento</string>
     <string name="checkout_ok">OK</string>
     <string name="checkout_skip">Pular</string>
 

diff --git a/checkout-ui/src/main/res/values-ru-rRU/strings.xml b/checkout-ui/src/main/res/values-ru-rRU/strings.xml
@@ -13,6 +13,7 @@
     <string name="checkout_one_click_delete_confirmation_message">Удалить способ оплаты %s?</string>
     <string name="checkout_one_click_delete">Удалить</string>
     <string name="checkout_error_dialog_title">Ошибка</string>
+    <string name="checkout_error_redirect_failed">Сбой перенаправления</string>
     <string name="checkout_ok">ОК</string>
     <string name="checkout_skip">Пропустить</string>
 

diff --git a/checkout-ui/src/main/res/values-sv-rSE/strings.xml b/checkout-ui/src/main/res/values-sv-rSE/strings.xml
@@ -13,6 +13,7 @@
     <string name="checkout_one_click_delete_confirmation_message">Ta bort betalningssätt %s?</string>
     <string name="checkout_one_click_delete">Radera</string>
     <string name="checkout_error_dialog_title">Fel</string>
+    <string name="checkout_error_redirect_failed">Omdirigering misslyckades</string>
     <string name="checkout_ok">OK</string>
     <string name="checkout_skip">Hoppa över</string>
 

diff --git a/checkout-ui/src/main/res/values-zh-rCN/strings.xml b/checkout-ui/src/main/res/values-zh-rCN/strings.xml
@@ -13,6 +13,7 @@
     <string name="checkout_one_click_delete_confirmation_message">删除付款方式 %s？</string>
     <string name="checkout_one_click_delete">删除</string>
     <string name="checkout_error_dialog_title">错误</string>
+    <string name="checkout_error_redirect_failed">重定向失败</string>
     <string name="checkout_ok">确定</string>
     <string name="checkout_skip">跳过</string>
 

diff --git a/checkout-ui/src/main/res/values-zh-rTW/strings.xml b/checkout-ui/src/main/res/values-zh-rTW/strings.xml
@@ -13,6 +13,7 @@
     <string name="checkout_one_click_delete_confirmation_message">是否刪除付款方式 %s？</string>
     <string name="checkout_one_click_delete">刪除</string>
     <string name="checkout_error_dialog_title">錯誤</string>
+    <string name="checkout_error_redirect_failed">無法重新導向</string>
     <string name="checkout_ok">確定</string>
     <string name="checkout_skip">跳過</string>
 

diff --git a/checkout-ui/src/main/res/values/strings.xml b/checkout-ui/src/main/res/values/strings.xml
@@ -13,6 +13,7 @@
     <string name="checkout_one_click_delete_confirmation_message">Delete payment method %s?</string>
     <string name="checkout_one_click_delete">Delete</string>
     <string name="checkout_error_dialog_title">Error</string>
+    <string name="checkout_error_redirect_failed">Redirect failed</string>
     <string name="checkout_ok">OK</string>
     <string name="checkout_skip">Skip</string>
 

diff --git a/checkout-util/build.gradle b/checkout-util/build.gradle
@@ -7,7 +7,6 @@ apply from: "$rootProject.rootDir/release.gradle"
 
 android {
     compileSdkVersion rootProject.compileSdkVersion
-    buildToolsVersion rootProject.buildToolsVersion
 
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion

diff --git a/checkout-wechatpay/build.gradle b/checkout-wechatpay/build.gradle
@@ -3,11 +3,10 @@ ext.releaseArtifactId = "wechatpay"
 apply plugin: "com.android.library"
 apply from: "$rootProject.rootDir/checkDependencies.gradle"
 apply from: "$rootProject.rootDir/quality.gradle"
-//apply from: "$rootProject.rootDir/release.gradle"
+apply from: "$rootProject.rootDir/release.gradle"
 
 android {
     compileSdkVersion rootProject.compileSdkVersion
-    buildToolsVersion rootProject.buildToolsVersion
 
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion

diff --git a/checkout-wechatpay/src/main/java/com/adyen/checkout/wechatpay/internal/WeChatPayUtil.java b/checkout-wechatpay/src/main/java/com/adyen/checkout/wechatpay/internal/WeChatPayUtil.java
@@ -8,6 +8,7 @@
 
 import com.adyen.checkout.core.model.WeChatPayDetails;
 import com.adyen.checkout.core.model.WeChatPaySdkRedirectData;
+import com.tencent.mm.opensdk.constants.Build;
 import com.tencent.mm.opensdk.modelbase.BaseReq;
 import com.tencent.mm.opensdk.modelbase.BaseResp;
 import com.tencent.mm.opensdk.modelpay.PayReq;
@@ -33,9 +34,10 @@ public final class WeChatPayUtil implements IWXAPIEventHandler {
 
     public static boolean isAvailable(@NonNull Context context) {
         IWXAPI api = WXAPIFactory.createWXAPI(context.getApplicationContext(), null, true);
-        boolean isAvailable = api.isWXAppInstalled() && api.isWXAppSupportAPI();
+        boolean isAppInstalled = api.isWXAppInstalled();
+        boolean isSupported = Build.PAY_SUPPORTED_SDK_INT <= api.getWXAppSupportAPI();
         api.detach();
-        return isAvailable;
+        return isAppInstalled && isSupported;
     }
 
     @NonNull

diff --git a/example-app/build.gradle b/example-app/build.gradle
@@ -8,7 +8,6 @@ if (file("local.gradle").exists()) {
 
 android {
     compileSdkVersion rootProject.compileSdkVersion
-    buildToolsVersion rootProject.buildToolsVersion
 
     defaultConfig {
         applicationId "com.adyen.example"
@@ -38,24 +37,24 @@ dependencies {
 
     implementation "com.android.support:appcompat-v7:${rootProject.supportLibVersion}"
 
-    implementation 'io.reactivex.rxjava2:rxjava:2.1.6'
-    implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
+    implementation "io.reactivex.rxjava2:rxjava:2.1.6"
+    implementation "io.reactivex.rxjava2:rxandroid:2.0.1"
 
-    implementation 'com.squareup.retrofit2:retrofit:2.4.0'
-    implementation 'com.squareup.retrofit2:converter-moshi:2.4.0'
-    implementation 'com.squareup.retrofit2:adapter-rxjava2:2.4.0'
+    implementation "com.squareup.retrofit2:retrofit:2.4.0"
+    implementation "com.squareup.retrofit2:converter-moshi:2.4.0"
+    implementation "com.squareup.retrofit2:adapter-rxjava2:2.4.0"
 
-    implementation 'com.squareup.okhttp3:logging-interceptor:3.10.0'
+    implementation "com.squareup.okhttp3:logging-interceptor:3.10.0"
 
-    implementation 'com.squareup.moshi:moshi:1.5.0'
+    implementation "com.squareup.moshi:moshi:1.5.0"
 
-    implementation project(':checkout-base')
-    implementation project(':checkout-core')
-    implementation project(':checkout-util')
-    implementation project(':checkout-ui')
+    implementation project(":checkout-base")
+    implementation project(":checkout-core")
+    implementation project(":checkout-util")
+    implementation project(":checkout-ui")
 
     // Plugins
-    implementation project(':checkout-nfc')
-    implementation project(':checkout-googlewallet')
-    implementation project(':checkout-wechatpay')
+    implementation project(":checkout-nfc")
+    implementation project(":checkout-googlewallet")
+    implementation project(":checkout-wechatpay")
 }
diff --git a/.../com/adyen/example/EspressoTestUtils.java → ...xample/androidtest/EspressoTestUtils.java b/.../com/adyen/example/EspressoTestUtils.java → ...xample/androidtest/EspressoTestUtils.java
@@ -1,4 +1,4 @@
-package com.adyen.example;
+package com.adyen.example.androidtest;
 
 import android.app.Activity;
 import android.app.Instrumentation;
@@ -24,6 +24,7 @@
 import static android.support.test.espresso.assertion.ViewAssertions.matches;
 import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
 import static android.support.test.espresso.matcher.ViewMatchers.withText;
+import static org.hamcrest.CoreMatchers.containsString;
 
 /**
  *
@@ -106,6 +107,10 @@ public static void closeAllActivities(Instrumentation instrumentation) throws Ex
         }
     }
 
+    public static void waitForToastWithText(String toastText) {
+        onView(withText(containsString(toastText))).inRoot(isToast()).check(matches(isDisplayed()));
+    }
+
     private static void waitForView(final int viewId, final long sleepInterval, final long timeout)
             throws InterruptedException, TimeoutException {
         final long currentTime = System.currentTimeMillis();
@@ -177,6 +182,7 @@ public void run() {
         return retAtomic.get();
     }
 
+    @NonNull
     private static Set<Activity> getActivitiesInStages(Stage... stages) {
         final Set<Activity> activities = new HashSet<>();
         final ActivityLifecycleMonitor instance = ActivityLifecycleMonitorRegistry.getInstance();
@@ -211,7 +217,12 @@ public Boolean call() {
         return activityClosed;
     }
 
+    @NonNull
+    private static ToastMatcher isToast() {
+        return new ToastMatcher();
+    }
+
     private EspressoTestUtils() {
-        // Private Constructor
+        throw new IllegalStateException("No instances.");
     }
 }