Delay outcomes call until init

* If outcomes is send before init is done then app id is not set, this makes wrappers crash
* Delay outcomes unitl init is done
* Add delay outcome testing

Author: Jeasmine

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

@@ -33,6 +33,9 @@ class OSTaskController {
     static final String CANCEL_GROUPED_NOTIFICATIONS = "cancelGroupedNotifications()";
     static final String PAUSE_IN_APP_MESSAGES = "pauseInAppMessages()";
     static final String APP_LOST_FOCUS = "onAppLostFocus()";
+    static final String SEND_OUTCOME = "sendOutcome()";
+    static final String SEND_UNIQUE_OUTCOME = "sendUniqueOutcome()";
+    static final String SEND_OUTCOME_WITH_VALUE = "sendOutcomeWithValue()";
     static final HashSet<String> METHODS_AVAILABLE_FOR_DELAY = new HashSet<>(Arrays.asList(
             GET_TAGS,
             SYNC_HASHED_EMAIL,

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

@@ -2951,7 +2951,8 @@ static OSSessionManager getSessionManager() {
    }
 
    static void sendClickActionOutcomes(@NonNull List<OSInAppMessageOutcome> outcomes) {
-      if (outcomeEventsController == null) {
+      // This is called from IAM shouldn't need this check
+      if (outcomeEventsController == null || appId == null) {
          OneSignal.Log(LOG_LEVEL.ERROR, "Make sure OneSignal.init is called first");
          return;
       }
@@ -2963,14 +2964,23 @@ public static void sendOutcome(@NonNull String name) {
       sendOutcome(name, null);
    }
 
-   public static void sendOutcome(@NonNull String name, OutcomeCallback callback) {
+   public static void sendOutcome(@NonNull final String name, final OutcomeCallback callback) {
       if (!isValidOutcomeEntry(name)) {
          logger.error("Make sure OneSignal initWithContext and setAppId is called first");
          return;
       }
 
-      if (outcomeEventsController == null) {
-         logger.error("Make sure OneSignal initWithContext and setAppId is called first");
+      // Outcomes needs app id, delay until init is not done
+      if (taskController.shouldQueueTaskForInit(OSTaskController.SEND_OUTCOME) || outcomeEventsController == null) {
+         logger.error("Waiting for remote params. " +
+                 "Moving " + OSTaskController.SEND_OUTCOME + " operation to a pending queue.");
+         taskController.addTaskToQueue(new Runnable() {
+            @Override
+            public void run() {
+               logger.debug("Running " + OSTaskController.HANDLE_NOTIFICATION_OPEN + " operation from pending queue.");
+               sendOutcome(name, callback);
+            }
+         });
          return;
       }
 
@@ -2981,12 +2991,21 @@ public static void sendUniqueOutcome(@NonNull String name) {
       sendUniqueOutcome(name, null);
    }
 
-   public static void sendUniqueOutcome(@NonNull String name, OutcomeCallback callback) {
+   public static void sendUniqueOutcome(@NonNull final String name, final OutcomeCallback callback) {
       if (!isValidOutcomeEntry(name))
          return;
 
-      if (outcomeEventsController == null) {
-         logger.error("Make sure OneSignal initWithContext and setAppId is called first");
+      // Outcomes needs app id, delay until init is not done
+      if (taskController.shouldQueueTaskForInit(OSTaskController.SEND_UNIQUE_OUTCOME) || outcomeEventsController == null) {
+         logger.error("Waiting for remote params. " +
+                 "Moving " + OSTaskController.SEND_UNIQUE_OUTCOME + " operation to a pending queue.");
+         taskController.addTaskToQueue(new Runnable() {
+            @Override
+            public void run() {
+               logger.debug("Running " + OSTaskController.HANDLE_NOTIFICATION_OPEN + " operation from pending queue.");
+               sendUniqueOutcome(name, callback);
+            }
+         });
          return;
       }
 
@@ -2997,12 +3016,21 @@ public static void sendOutcomeWithValue(@NonNull String name, float value) {
       sendOutcomeWithValue(name, value, null);
    }
 
-   public static void sendOutcomeWithValue(@NonNull String name, float value, OutcomeCallback callback) {
+   public static void sendOutcomeWithValue(@NonNull final String name, final float value, final OutcomeCallback callback) {
       if (!isValidOutcomeEntry(name) || !isValidOutcomeValue(value))
          return;
 
-      if (outcomeEventsController == null) {
-         logger.error("Make sure OneSignal.init is called first");
+      // Outcomes needs app id, delay until init is not done
+      if (taskController.shouldQueueTaskForInit(OSTaskController.SEND_OUTCOME_WITH_VALUE) || outcomeEventsController == null) {
+         logger.error("Waiting for remote params. " +
+                 "Moving " + OSTaskController.SEND_OUTCOME_WITH_VALUE + " operation to a pending queue.");
+         taskController.addTaskToQueue(new Runnable() {
+            @Override
+            public void run() {
+               logger.debug("Running " + OSTaskController.HANDLE_NOTIFICATION_OPEN + " operation from pending queue.");
+               sendOutcomeWithValue(name, value, callback);
+            }
+         });
          return;
       }
 

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

@@ -49,6 +49,7 @@
 import org.robolectric.shadows.ShadowLog;
 import org.robolectric.shadows.ShadowPausedSystemClock;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -112,12 +113,9 @@ public class OutcomeEventIntegrationTests {
     private OSTrackerFactory trackerFactory;
     private static List<OSInfluence> lastInfluencesEnding;
 
-    OSSessionManager.SessionListener sessionListener = new OSSessionManager.SessionListener() {
-        @Override
-        public void onSessionEnding(@NonNull List<OSInfluence> lastInfluences) {
-            OneSignal_getSessionListener().onSessionEnding(lastInfluences);
-            OutcomeEventIntegrationTests.lastInfluencesEnding = lastInfluences;
-        }
+    OSSessionManager.SessionListener sessionListener = lastInfluences -> {
+        OneSignal_getSessionListener().onSessionEnding(lastInfluences);
+        OutcomeEventIntegrationTests.lastInfluencesEnding = lastInfluences;
     };
 
     private static OneSignal.OSNotificationOpenedHandler getNotificationOpenedHandler() {
@@ -940,6 +938,20 @@ public void testCleaningCachedNotifications_after7Days_willAlsoCleanUniqueOutcom
         assertEquals(0, getAllUniqueOutcomeNotificationRecordsDB(dbHelper).size());
     }
 
+    @Test
+    public void testDelayOutcomes() throws Exception {
+        OneSignal.sendOutcome(ONESIGNAL_OUTCOME_NAME);
+        OneSignalInit();
+        threadAndTaskWait();
+
+        // Foreground app through icon
+        blankActivityController.resume();
+        threadAndTaskWait();
+
+        assertMeasureAtIndex(1, ONESIGNAL_OUTCOME_NAME);
+
+    }
+
     private void foregroundAppAfterClickingNotification() throws Exception {
         OneSignalInit();
         threadAndTaskWait();