Fix to make sure the opened handler is fired after OneSignal SDK setup (#906)

* We were not setting the sessionManager to the correct session on notification click
* Now we fire the callback for opened notifications after all OneSignal work is done
* Unit test written to make sure sending outcomes from opened handler works correctly

Author: mikechoch

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

@@ -2079,14 +2079,14 @@ public static void handleNotificationOpen(Context inContext, JSONArray data, boo
       if (!defaultOpenActionDisabled)
          urlOpened = openURLFromNotification(inContext, data);
 
-      runNotificationOpenedCallback(data, true, fromAlert);
-
       // Check if the notification click should lead to a DIRECT session
       if (shouldInitDirectSessionFromNotificationOpen(inContext, fromAlert, urlOpened, defaultOpenActionDisabled)) {
          // We want to set the app entry state to NOTIFICATION_CLICK when coming from background
          appEntryState = AppEntryAction.NOTIFICATION_CLICK;
          sessionManager.onDirectSessionFromNotificationOpen(notificationId);
       }
+
+      runNotificationOpenedCallback(data, true, fromAlert);
    }
 
    static boolean startOrResumeApp(Context inContext) {

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

@@ -319,6 +319,33 @@ public void testOutcomeNameSentWithMeasureOncePerSession_whenSendingMultipleUniq
         assertMeasureAtIndex(4, ONESIGNAL_OUTCOME_NAME);
     }
 
+    @Test
+    public void testCorrectOutcomeSent_fromNotificationOpenedHandler() throws Exception {
+        // Init OneSignal with a custom opened handler
+        OneSignalInit(new OneSignal.NotificationOpenedHandler() {
+            @Override
+            public void notificationOpened(OSNotificationOpenResult result) {
+                OneSignal.sendOutcome(ONESIGNAL_OUTCOME_NAME);
+            }
+        });
+        threadAndTaskWait();
+
+        // Background app
+        blankActivityController.pause();
+        threadAndTaskWait();
+
+        // Receive and open a notification
+        OneSignal.handleNotificationOpen(blankActivity, new JSONArray("[{ \"alert\": \"Test Msg\", \"custom\": { \"i\": \"UUID\" } }]"), false, ONESIGNAL_NOTIFICATION_ID);
+        threadAndTaskWait();
+
+        // Foreground the application
+        blankActivityController.resume();
+        threadAndTaskWait();
+
+        // Make sure a measure request is made with the correct session and notifications
+        assertMeasureAtIndex(3, true, ONESIGNAL_OUTCOME_NAME, new JSONArray("[" + ONESIGNAL_NOTIFICATION_ID + "]"));
+    }
+
     @Test
     public void testNoDirectSession_fromNotificationOpen_whenAppIsInForeground() throws Exception {
         OneSignalInit();
@@ -729,4 +756,14 @@ private void OneSignalInit() throws Exception {
         new MockOutcomesUtils().saveOutcomesParams(params);
         blankActivityController.resume();
     }
+
+    private void OneSignalInit(OneSignal.NotificationOpenedHandler notificationOpenedHandler) throws Exception {
+        OneSignal.setLogLevel(OneSignal.LOG_LEVEL.VERBOSE, OneSignal.LOG_LEVEL.NONE);
+        ShadowOSUtils.subscribableStatus = 1;
+        OneSignal.init(blankActivity, "123456789", ONESIGNAL_APP_ID, notificationOpenedHandler);
+        threadAndTaskWait();
+        OneSignalPackagePrivateHelper.RemoteOutcomeParams params = new OneSignalPackagePrivateHelper.RemoteOutcomeParams();
+        new MockOutcomesUtils().saveOutcomesParams(params);
+        blankActivityController.resume();
+    }
 }