Added launch url supression and test for that scenario.

Author: gonzalonarbaiz

Examples/OneSignalDemo/local.properties

@@ -4,6 +4,6 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Wed Jan 27 19:24:35 ART 2021
+#Tue Jul 23 19:22:28 PDT 2019
 ndk.dir=/Users/mikechoch/Library/Android/sdk/ndk-bundle
-sdk.dir=/Users/gonzalonarbaiz/Library/Android/sdk
+sdk.dir=/Users/mikechoch/Library/Android/sdk

OneSignalSDK/onesignal/src/main/java/com/onesignal/OneSignal.java

@@ -1977,6 +1977,7 @@ private static boolean openURLFromNotification(Context context, JSONArray dataAr
       int jsonArraySize = dataArray.length();
 
       boolean urlOpened = false;
+      boolean launchUrlSuppress = "true".equals(OSUtils.getManifestMeta(context, "com.onesignal.suppressLaunchURLs"));
 
       for (int i = 0; i < jsonArraySize; i++) {
          try {
@@ -1988,7 +1989,7 @@ private static boolean openURLFromNotification(Context context, JSONArray dataAr
 
             if (customJSON.has("u")) {
                String url = customJSON.optString("u", null);
-               if (url != null) {
+               if (url != null && !launchUrlSuppress) {
                   OSUtils.openURLInBrowser(url);
                   urlOpened = true;
                }
@@ -2149,15 +2150,13 @@ public void run() {
 
       boolean urlOpened = false;
       boolean defaultOpenActionDisabled = "DISABLE".equals(OSUtils.getManifestMeta(context, "com.onesignal.NotificationOpened.DEFAULT"));
-      boolean launchUrlSuppress = "true".equals(OSUtils.getManifestMeta(context, "com.onesignal.suppressLaunchURLs"));
 
-      if (!defaultOpenActionDisabled && !launchUrlSuppress)
+      if (!defaultOpenActionDisabled)
          urlOpened = openURLFromNotification(context, data);
 
-      logger.debug("handleNotificationOpen from context: " + context + " with fromAlert: " + fromAlert + " urlOpened: " + urlOpened + " defaultOpenActionDisabled: " + defaultOpenActionDisabled
-              + " launchUrlSuppress: " + defaultOpenActionDisabled );
+      logger.debug("handleNotificationOpen from context: " + context + " with fromAlert: " + fromAlert + " urlOpened: " + urlOpened + " defaultOpenActionDisabled: " + defaultOpenActionDisabled);
       // Check if the notification click should lead to a DIRECT session
-      if (shouldInitDirectSessionFromNotificationOpen(context, fromAlert, urlOpened, defaultOpenActionDisabled, launchUrlSuppress)) {
+      if (shouldInitDirectSessionFromNotificationOpen(context, fromAlert, urlOpened, defaultOpenActionDisabled)) {
          applicationOpenedByNotification(notificationId);
       }
 
@@ -2194,11 +2193,10 @@ static boolean startOrResumeApp(Activity inContext) {
     * 5. App is coming from the background
     * 6. App open/resume intent exists
     */
-   private static boolean shouldInitDirectSessionFromNotificationOpen(Activity context, boolean fromAlert, boolean urlOpened, boolean defaultOpenActionDisabled, boolean launchUrlSuppress) {
+   private static boolean shouldInitDirectSessionFromNotificationOpen(Activity context, boolean fromAlert, boolean urlOpened, boolean defaultOpenActionDisabled) {
       return !fromAlert
               && !urlOpened
               && !defaultOpenActionDisabled
-              && !launchUrlSuppress
               && !inForeground
               && startOrResumeApp(context);
    }

OneSignalSDK/unittest/src/test/java/com/test/onesignal/MainOneSignalClassRunner.java

@@ -1123,7 +1123,6 @@ public void testOpeningLaunchUrl() throws Exception {
       // If this doesn't' happen, notifications will not arrive
       OneSignalInit();
       fastColdRestartApp();
-
       OneSignal.initWithContext(blankActivity);
       // Removes app launch
       shadowOf(blankActivity).getNextStartedActivity();
@@ -1168,6 +1167,19 @@ public void testDisableOpeningLauncherActivityOnNotificationOpen() throws Except
       assertEquals("Test Msg", lastNotificationOpenedBody);
    }
 
+   @Test
+   public void testLaunchUrlSuppressTrue() throws Exception {
+      // Add the 'com.onesignal.suppressLaunchURLs' as 'true' meta-data tag
+      OneSignalShadowPackageManager.addManifestMetaData("com.onesignal.suppressLaunchURLs", "true");
+
+      // Removes app launch
+      shadowOf(blankActivity).getNextStartedActivity();
+
+      // No OneSignal init here to test case where it is located in an Activity.
+      OneSignal_handleNotificationOpen(blankActivity, new JSONArray("[{ \"alert\": \"Test Msg\", \"custom\": { \"i\": \"UUID\", \"u\": \"http://google.com\" } }]"), false, ONESIGNAL_NOTIFICATION_ID);
+      assertNull(shadowOf(blankActivity).getNextStartedActivity());
+   }
+
    private static String notificationReceivedBody;
    private static int androidNotificationId;