add back forward activity trampolining

Now everything uses the same forward activity trampolining behavior so
everything works consistently!, including the behavior of HMS message
type notifications.

Removed the startLauncherActivity flag from handleNotificationOpen due
this consistently as well. Renamed startOrResumeApp to
openDestinationActivity as this now handles URL opens as well. There
was a bug here where HMS notifications did not open launch URLs that has
also been fixed here.
Added logging if we don't open an Activity, to indicate the behavior was
intended.

Author: jkasten2

OneSignalSDK/onesignal/src/main/java/com/onesignal/GenerateNotificationOpenIntent.kt

@@ -86,7 +86,7 @@ class GenerateNotificationOpenIntent(
     }
 
     // Return the provide intent if one was set, otherwise default to opening the app.
-    private fun getIntentVisible(): Intent? {
+    fun getIntentVisible(): Intent? {
         if (intent != null) return intent
         return getIntentAppOpen()
     }

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

@@ -114,7 +114,7 @@ static void processIntent(Context context, Intent intent) {
          if (!(context instanceof Activity))
             OneSignal.onesignalLog(OneSignal.LOG_LEVEL.ERROR, "NotificationOpenedProcessor processIntent from an non Activity context: " + context);
          else OneSignal.handleNotificationOpen((Activity) context, intentExtras.getDataArray(),
-                 false, OSNotificationFormatHelper.getOSNotificationIdFromJson(intentExtras.getJsonData()));
+                 OSNotificationFormatHelper.getOSNotificationIdFromJson(intentExtras.getJsonData()));
       }
    }
 

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

@@ -68,7 +68,6 @@ private static void handleProcessJsonOpenData(@NonNull Activity activity, @NonNu
         OneSignal.handleNotificationOpen(
             activity,
             new JSONArray().put(jsonData),
-            true,
             OSNotificationFormatHelper.getOSNotificationIdFromJson(jsonData)
         );
     }

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

@@ -2394,7 +2394,7 @@ static void fireForegroundHandlers(OSNotificationController notificationControll
    /**
     * Method called when opening a notification
     */
-   static void handleNotificationOpen(final Activity context, final JSONArray data, final boolean startLauncherActivity, @Nullable final String notificationId) {
+   static void handleNotificationOpen(final Activity context, final JSONArray data, @Nullable final String notificationId) {
       // Delay call until remote params are set
       if (taskRemoteController.shouldQueueTaskForInit(OSTaskRemoteController.HANDLE_NOTIFICATION_OPEN)) {
          logger.error("Waiting for remote params. " +
@@ -2404,7 +2404,7 @@ static void handleNotificationOpen(final Activity context, final JSONArray data,
             public void run() {
                if (appContext != null) {
                   logger.debug("Running " + OSTaskRemoteController.HANDLE_NOTIFICATION_OPEN + " operation from pending queue.");
-                  handleNotificationOpen(context, data, startLauncherActivity, notificationId);
+                  handleNotificationOpen(context, data, notificationId);
                }
             }
          });
@@ -2422,39 +2422,35 @@ public void run() {
 
       if (shouldInitDirectSessionFromNotificationOpen(context, data)) {
          applicationOpenedByNotification(notificationId);
-
-         if (startLauncherActivity) {
-            // Start activity with an activity trampolining
-            startOrResumeApp(context);
-         }
       }
 
+      openDestinationActivity(context, data);
+
       runNotificationOpenedCallback(data);
    }
 
-   // Reverse activity trampolining is used for most notifications.
-   // This method is only used if the push provider does support it.
-   // This opens the app in the same way an Android home screen launcher does.
-   // This means we expect the following behavior:
-   //    1. Starts the Activity defined in the app's AndroidManifest.xml as "android.intent.action.MAIN"
-   //    2. If the app is already running, instead the last activity will be resumed
-   //    3. If the app is not running (due to being push out of memory), the last activity will be resumed
-   //    4. If the app is no longer in the recent apps list, it is not resumed, same as #1 above.
-   //        - App is removed from the recent app's list if it is swiped away or "clear all" is pressed.
-   static boolean startOrResumeApp(@NonNull Activity activity) {
-      Intent launchIntent = activity.getPackageManager().getLaunchIntentForPackage(activity.getPackageName());
-      logger.debug("startOrResumeApp from context: " + activity + " isRoot: " + activity.isTaskRoot() + " with launchIntent: " + launchIntent);
-
-      // Not all apps have a launcher intent, such as one that only provides a homescreen widget
-      if (launchIntent == null)
-         return false;
-      // Removing package from the intent, this treats the app as if it was started externally.
-      // This gives us the resume app behavior noted above.
-      // Android 11 no longer requires nulling this out to get this behavior.
-      launchIntent.setPackage(null);
-
-      activity.startActivity(launchIntent);
-      return true;
+   static private void openDestinationActivity(
+      @NonNull final Activity activity,
+      @NonNull final JSONArray pushPayloads
+   ) {
+      try {
+         // Always use the top most notification if user tapped on the summary notification
+         JSONObject firstPayloadItem = pushPayloads.getJSONObject(0);
+         GenerateNotificationOpenIntent intentGenerator = GenerateNotificationOpenIntentFromPushPayload.INSTANCE.create(
+            activity,
+            firstPayloadItem
+         );
+
+         Intent intent = intentGenerator.getIntentVisible();
+         if (intent != null) {
+            activity.startActivity(intent);
+         }
+         else {
+            logger.info("SDK not showing an Activity automatically due to it's settings.");
+         }
+      } catch (JSONException e) {
+         e.printStackTrace();
+      }
    }
 
    private static boolean shouldInitDirectSessionFromNotificationOpen(Activity context, final JSONArray data) {

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

@@ -129,8 +129,8 @@ public static JSONObject bundleAsJSONObject(Bundle bundle) {
       return NotificationBundleProcessor.bundleAsJSONObject(bundle);
    }
 
-   public static void OneSignal_handleNotificationOpen(Activity context, final JSONArray data, final boolean fromHMSMessage, final String notificationId) {
-      OneSignal.handleNotificationOpen(context, data, fromHMSMessage, notificationId);
+   public static void OneSignal_handleNotificationOpen(Activity context, final JSONArray data, final String notificationId) {
+      OneSignal.handleNotificationOpen(context, data, notificationId);
    }
 
    public static BigInteger OneSignal_getAccentColor(JSONObject fcmJson) {