Release 6.1.0.

Author: IngenicoEPayments

Jenkinsfile

@@ -8,6 +8,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:7.4.1'
         classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0'
+        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.3"
     }
 }
 

build.gradle

@@ -10,15 +10,15 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx10248m -XX:MaxPermSize=256m
-# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 POM_GROUP_ID=com.ingenico.connect.gateway
 POM_ARTIFACT_ID=connect-sdk-client-android
-POM_VERSION=6.0.1
+POM_VERSION=6.1.0
 POM_NAME=connect-sdk-client-android
 POM_DESCRIPTION=SDK to communicate with the Ingenico ePayments platform using the Ingenico Connect Client API
 POM_URL=https://github.com/Ingenico-ePayments/connect-sdk-client-android

gradle.properties

@@ -7,6 +7,7 @@ plugins {
     id 'kotlin-android'
     id 'signing'
     id 'maven-publish'
+    id 'org.sonarqube'
 }
 
 android {
@@ -17,6 +18,7 @@ android {
         targetSdkVersion 33
         versionCode 1
         versionName "1.0"
+        consumerProguardFiles 'consumer-rules.pro'
     }
 
     compileOptions {
@@ -32,7 +34,6 @@ android {
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
 }

ingenicoconnect-sdk/build.gradle

@@ -15,3 +15,6 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
+
+# The line below ensures that JSON deserialisation succeeds when using obfuscation in your app.
+-keep class com.ingenico.connect.gateway.sdk.client.android.sdk.model.** { *; }

ingenicoconnect-sdk/proguard-rules.pro ingenicoconnect-sdk/consumer-rules.proingenicoconnect-sdk/proguard-rules.pro renamed to ingenicoconnect-sdk/consumer-rules.pro

@@ -80,16 +80,18 @@ public static boolean isGooglePayAllowed(Context context, C2sCommunicator commun
         // Wait for a response
         try {
             Tasks.await(task, Constants.ACCEPTABLE_WAIT_TIME_IN_MILISECONDS, TimeUnit.MILLISECONDS);
+
+            // Handle result
+            if (task.isSuccessful()) {
+                return task.getResult();
+            }
+
+            return false;
         } catch (TimeoutException e) {
             Log.e(TAG, "Timeout while making isReadyToPay call: " + task.getException());
+            return false;
         } catch (Exception e) {
             Log.e(TAG, "Exception occurred while making isReadyToPay call: " + task.getException());
-        }
-        // Handle result
-        if (task.isSuccessful()) {
-            return task.getResult();
-        } else {
-            Log.e(TAG, "Exception occurred while making isReadyToPay call: " + task.getException());
             return false;
         }
     }
@@ -129,17 +131,19 @@ public static boolean isGooglePayAllowed(BasicPaymentProduct googlePay) {
         // Wait for a response
         try {
             Tasks.await(task, Constants.ACCEPTABLE_WAIT_TIME_IN_MILISECONDS, TimeUnit.MILLISECONDS);
+
+            // Handle result
+            if (task.isSuccessful()) {
+                return task.getResult();
+            }
+
+            return false;
         } catch (TimeoutException e) {
             Log.e(TAG, "Timeout while making isReadyToPay call: " + task.getException());
+            return false;
         } catch (Exception e) {
             Log.e(TAG, "Exception occurred while making isReadyToPay call: " + task.getException());
-        }
-        // Handle result
-        if (task.isSuccessful()) {
-            return task.getResult();
-        } else {
-            Log.e(TAG, "Exception occurred while making isReadyToPay call: " + task.getException());
-            return true;
+            return false;
         }
     }
 

ingenicoconnect-sdk/src/main/java/com/ingenico/connect/gateway/sdk/client/android/sdk/GooglePayUtil.java

@@ -12,6 +12,7 @@
 import com.ingenico.connect.gateway.sdk.client.android.sdk.configuration.Constants;
 import com.ingenico.connect.gateway.sdk.client.android.sdk.encryption.EncryptUtil;
 
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -62,7 +63,7 @@ public static Map<String, String> getMetadata(Context context, String appIdentif
 			throw new IllegalArgumentException("Error creating metadata, context may not be null.");
 		}
 
-		Map<String, String> metaData = new HashMap<String, String>();
+		Map<String, String> metaData = new HashMap<>();
 
 		// Add OS + buildversion
 		metaData.put(METADATA_PLATFORM_IDENTIFIER, "Android/" + android.os.Build.VERSION.RELEASE);
@@ -109,7 +110,7 @@ public static String getBase64EncodedMetadata(Context context, String appIdentif
 
 		Gson gson = new Gson();
 		String jsonMetadata = gson.toJson(getMetadata(context, appIdentifier, null));
-		String encodedData = new String(encryptUtil.base64UrlEncode(jsonMetadata.getBytes()));
+		String encodedData = new String(encryptUtil.base64UrlEncode(jsonMetadata.getBytes(StandardCharsets.UTF_8)));
 
 		return encodedData;
 	}
@@ -126,7 +127,7 @@ public static String getBase64EncodedMetadata(Context context, String appIdentif
 
 		Gson gson = new Gson();
 		String jsonMetadata = gson.toJson(getMetadata(context, appIdentifier, ipAddress));
-		String encodedData = new String(encryptUtil.base64UrlEncode(jsonMetadata.getBytes()));
+		String encodedData = new String(encryptUtil.base64UrlEncode(jsonMetadata.getBytes(StandardCharsets.UTF_8)));
 
 		return encodedData;
 	}
@@ -143,7 +144,7 @@ public static String getBase64EncodedMetadata(Map<String, String> metadata) {
 
 		Gson gson = new Gson();
 		String jsonMetadata = gson.toJson(metadata);
-		String encodedData = new String(encryptUtil.base64UrlEncode(jsonMetadata.getBytes()));
+		String encodedData = new String(encryptUtil.base64UrlEncode(jsonMetadata.getBytes(StandardCharsets.UTF_8)));
 
 		return encodedData;
 	}

ingenicoconnect-sdk/src/main/java/com/ingenico/connect/gateway/sdk/client/android/sdk/Util.java

@@ -96,8 +96,8 @@ protected BasicPaymentItems doInBackground(String... params) {
             ExecutorService executorService = Executors.newFixedThreadPool(2);
 
             // Create the callables that will be executed
-            Callable<BasicPaymentProducts> paymentProductsCallable = new BasicPaymentProductsAsyncTask(context, paymentContext, communicator, new LinkedList<OnBasicPaymentProductsCallCompleteListener>());
-            Callable<BasicPaymentProductGroups> paymentProductGroupsCallable = new BasicPaymentProductGroupsAsyncTask(context, paymentContext, communicator, new LinkedList<OnBasicPaymentProductGroupsCallCompleteListener>());
+            Callable<BasicPaymentProducts> paymentProductsCallable = new BasicPaymentProductsAsyncTask(context, paymentContext, communicator, new LinkedList<>());
+            Callable<BasicPaymentProductGroups> paymentProductGroupsCallable = new BasicPaymentProductGroupsAsyncTask(context, paymentContext, communicator, new LinkedList<>());
 
             // Retrieve the futures from the callable tasks
             Future<BasicPaymentProducts> paymentProductsFuture = executorService.submit(paymentProductsCallable);
@@ -111,17 +111,14 @@ protected BasicPaymentItems doInBackground(String... params) {
                 // Return a list of the basicPaymentProducts and basicPaymentProductGroups combined
                 return createBasicPaymentItems(basicPaymentProducts, basicPaymentProductGroups);
 
-            } catch (InterruptedException e) {
-                Log.i(TAG, "Error while getting paymentItems: " + e.getMessage());
-                e.printStackTrace();
-            } catch (ExecutionException e) {
+            } catch (InterruptedException | ExecutionException e) {
                 Log.i(TAG, "Error while getting paymentItems: " + e.getMessage());
                 e.printStackTrace();
             }
         } else {
 
             // Create the paymentProductsCallable
-            Callable<BasicPaymentProducts> paymentProductsCallable = new BasicPaymentProductsAsyncTask(context, paymentContext, communicator, new LinkedList<OnBasicPaymentProductsCallCompleteListener>());
+            Callable<BasicPaymentProducts> paymentProductsCallable = new BasicPaymentProductsAsyncTask(context, paymentContext, communicator, new LinkedList<>());
             try {
 
                 // Retrieve the basicPaymentProducts
@@ -229,6 +226,6 @@ protected void onPostExecute(BasicPaymentItems basicPaymentItems) {
      */
     @Deprecated
     public interface OnBasicPaymentItemsCallCompleteListener {
-        public void onBasicPaymentItemsCallComplete(BasicPaymentItems basicPaymentItems);
+        void onBasicPaymentItemsCallComplete(BasicPaymentItems basicPaymentItems);
     }
 }

ingenicoconnect-sdk/src/main/java/com/ingenico/connect/gateway/sdk/client/android/sdk/asynctask/BasicPaymentItemsAsyncTask.java

@@ -104,6 +104,6 @@ private BasicPaymentProductGroups getPaymentProductGroupsInBackground() {
      */
     @Deprecated
     public interface OnBasicPaymentProductGroupsCallCompleteListener {
-        public void onBasicPaymentProductGroupsCallComplete(BasicPaymentProductGroups basicPaymentProductGroups);
+        void onBasicPaymentProductGroupsCallComplete(BasicPaymentProductGroups basicPaymentProductGroups);
     }
 }

ingenicoconnect-sdk/src/main/java/com/ingenico/connect/gateway/sdk/client/android/sdk/asynctask/BasicPaymentProductGroupsAsyncTask.java

@@ -158,6 +158,6 @@ private BasicPaymentProduct getPaymentProduct(BasicPaymentProducts basicPaymentP
      */
 	@Deprecated
     public interface OnBasicPaymentProductsCallCompleteListener {
-        public void onBasicPaymentProductsCallComplete(BasicPaymentProducts basicPaymentProducts);
+        void onBasicPaymentProductsCallComplete(BasicPaymentProducts basicPaymentProducts);
     }
 }