Merge branch 'CON-OptionalDeeplink' into 'main'

[CON-6080]Added optional deeplinkUrl param to support navigation back to app

See merge request connect/android-sdk-legacy!37

Author: Bruce McFadden

CHANGELOG.md

@@ -1,9 +1,9 @@
 # Changelog
 
-### 2.2.0 (June 13, 2023)
+### 2.3.0 (June 22, 2023)
 
-Breaking Change:
-- Added deeplink support to navigate it back to app (App to App Authentication).
+Enhancement:
+- Added optional deeplinkUrl param to support navigation back to app (App to App Authentication).
 
 ### 2.1.0 (June 3, 2023)
 

README.md

@@ -20,14 +20,12 @@ The Connect Android SDK supports the following Android versions.
 
 ## Step 1 - Add repository to your project
 
-## Gradle
+## Maven-central
 
-Add the following code to the dependency section in the build.gradle file. To install a specific version, replace “+” with the preferred version number:
+Add the following code to the dependency section in the build.gradle file.
 
 ```
-dependencies {
-    implementation 'com.mastercard.openbanking.connect:connect-sdk:+'
-}
+ implementation 'com.mastercard.openbanking.connect:connect-sdk:<insert latest version>' 
 ```
 
 ## Manual

connect-sdk/build.gradle

@@ -60,7 +60,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 30
         versionCode 105
-        versionName "2.2.0"
+        versionName "2.3.0"
 
         if (!properties.isEmpty()) {
             resValue "string", "partnerId", properties.getProperty("PARTNER_ID", "")
@@ -116,7 +116,7 @@ dependencies {
 
 ext {
     PUBLISH_GROUP_ID = 'com.mastercard.openbanking.connect'
-    PUBLISH_VERSION = '2.2.0'
+    PUBLISH_VERSION = '2.3.0'
     PUBLISH_ARTIFACT_ID = 'connect-sdk'
 }
 

connect-sdk/src/androidTest/java/com/mastercard/openbanking/connect/ConnectActivityTest.java

@@ -240,6 +240,21 @@ public void test10NullEventHandler() throws InterruptedException {
         Thread.sleep(5000);
     }
 
+    @Test
+    public void test11ConnectWithGoodUrlWithoutDeeplink() throws InterruptedException {
+
+        String url = goodUrl.replace("localhost:", "10.0.2.2:");
+        Connect.start(InstrumentationRegistry.getContext(), url, new TestEventHandler());
+
+        mIdlingResource.waitForEvent("search");
+        onWebView().withElement(findElement(Locator.CLASS_NAME, "icon-nav_exit_button")).perform(webClick());
+
+        Thread.sleep(1000);
+
+        onWebView().withElement(findElement(Locator.LINK_TEXT, "Exit")).perform(webClick());
+
+    }
+
     private void generateConnectUrl() {
         if (goodUrl.isEmpty()) {
             // Use countdown latch to wait for chain of Finicity API's Auth, Customer, Consumer, Generate to complete asynchronously.
@@ -270,6 +285,7 @@ public void onSuccess(String link) {
 
     }
 
+
     public class TestEventHandler implements EventHandler {
         private static final String TAG = "TestEventHandler";
 

connect-sdk/src/main/java/com/mastercard/openbanking/connect/Connect.java

@@ -22,7 +22,7 @@
 import java.util.TimerTask;
 
 public class Connect extends Activity {
-    private static final String SDK_VERSION = "2.2.0";
+    private static final String SDK_VERSION = "2.3.0";
 
     private static final String ALREADY_RUNNING_ERROR_MSG = "There is already another Connect Activity running. " +
             "Only 1 is allowed at a time. Please allow the current activity to finish " +
@@ -38,6 +38,24 @@ public class Connect extends Activity {
     private static ConnectJsInterface jsInterface;
     public static Boolean runningUnitTest = false;
 
+    public static void start(Context context, String connectUrl, EventHandler eventHandler) {
+        if (Connect.CONNECT_INSTANCE != null) {
+            throw new RuntimeException(ALREADY_RUNNING_ERROR_MSG);
+        }
+
+        Intent connectIntent = new Intent(context, Connect.class);
+        if (runningUnitTest) {
+            connectIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        }
+        connectIntent.putExtra(Connect.CONNECT_URL_INTENT_KEY, connectUrl);
+
+        // Set EventListener
+        Connect.EVENT_HANDLER = eventHandler;
+
+        context.startActivity(connectIntent);
+    }
+
+
     public static void start(Context context, String connectUrl, String deepLinkUrl, EventHandler eventHandler) {
         if (Connect.CONNECT_INSTANCE != null) {
             throw new RuntimeException(ALREADY_RUNNING_ERROR_MSG);
@@ -268,8 +286,13 @@ protected void stopPingTimer() {
 
     protected void pingConnect() {
         String deepLinkUrl = getIntent().getStringExtra(CONNECT_DEEPLINK_URL_INTENT_KEY);
-        String javascript = "window.postMessage({ type: 'ping', sdkVersion: '" + SDK_VERSION + "', platform: 'Android',deepLinkUrl: '" + deepLinkUrl + "' }, '*')";
-        if (mMainWebView != null) {
+        String javascript;
+        if(deepLinkUrl != null){
+             javascript = "window.postMessage({ type: 'ping', sdkVersion: '" + SDK_VERSION + "', platform: 'Android',deepLinkUrl: '" + deepLinkUrl + "' }, '*')";
+        }else{
+             javascript = "window.postMessage({ type: 'ping', sdkVersion: '" + SDK_VERSION + "', platform: 'Android' }, '*')";
+        }
+       if (mMainWebView != null) {
             mMainWebView.evaluateJavascript(javascript, null);
         }
     }