=update manifest and 3ds logic

README.md

@@ -26,11 +26,11 @@ dependencies {
  implementation 'com.android.support:design:27.1.1'
  implementation 'com.google.code.gson:gson:2.8.5'
  implementation 'com.android.volley:volley:1.1.0'
- implementation 'com.github.checkout:frames-android:v2.1.1'
+ implementation 'com.github.checkout:frames-android:v2.1.2'
 }
 ```
 
-> You can find more about the installation [here](https://jitpack.io/#checkout/frames-android/v2.1.1)
+> You can find more about the installation [here](https://jitpack.io/#checkout/frames-android/v2.1.2)
 
 > Please keep in mind that the Jitpack repository should to be added to the project gradle file while the dependency should be added in the module gradle file. [(see more about gradle files)](https://developer.android.com/studio/build)
 

android-sdk/proguard-rules.pro

@@ -9,7 +9,7 @@
 # and specify the fully qualified class name to the JavaScript interface
 # class:
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
+#   public *;p
 #}
 
 # Uncomment this to preserve the line number information for
@@ -19,3 +19,8 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+
+-dontshrink
+-dontoptimize
+-dontpreverify
+-keep class com.checkout.*** { *; }

android-sdk/src/main/AndroidManifest.xml

@@ -1,14 +1,15 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.checkout.android_sdk">
 
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
         android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme" />
+        android:theme="@style/AppTheme"
+        tools:replace="android:theme"
+        />
 
 </manifest>

android-sdk/src/main/java/com/checkout/android_sdk/PaymentForm.java

@@ -200,11 +200,21 @@ public void onPageFinished(WebView view, String url) {
                 if (url.contains(successUrl)) {
                     Uri uri = Uri.parse(url);
                     String paymentToken = uri.getQueryParameter("cko-payment-token");
-                    m3DSecureListener.onSuccess(paymentToken);
+                    String sessionId = uri.getQueryParameter("cko-session-id");
+                    if(paymentToken==null) {
+                        m3DSecureListener.onSuccess(sessionId);
+                    } else {
+                        m3DSecureListener.onSuccess(paymentToken);
+                    }
                 } else if (url.contains(failsUrl)) {
                     Uri uri = Uri.parse(url);
                     String paymentToken = uri.getQueryParameter("cko-payment-token");
-                    m3DSecureListener.onError(paymentToken);
+                    String sessionId = uri.getQueryParameter("cko-session-id");
+                    if(paymentToken==null) {
+                        m3DSecureListener.onError(sessionId);
+                    } else {
+                        m3DSecureListener.onError(paymentToken);
+                    }
                 }
             }
         });

app/proguard-android.txt

@@ -0,0 +1,4 @@
+-dontshrink
+-dontoptimize
+-dontpreverify
+-keep class com.checkout.*** { *; }

build.gradle

@@ -1,14 +1,14 @@
 buildscript {
 
-    ext.kotlin_version = '1.3.10'
+    ext.kotlin_version = '1.3.72'
 
     repositories {
         google()
         jcenter()
         maven { url "https://jitpack.io" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:4.0.1'
 
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Sep 23 12:39:03 BST 2019
+#Mon Jul 20 10:34:54 BST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip