Init IAM with cached IAMs on new session

* When app is closed and opened if it is a new session, the IAMs will be delayed until on_session call, this end with the idea that IAMs stop working
* Always init app with cache IAMs

Author: Jeasmine

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

@@ -2,7 +2,6 @@
 
 import android.app.AlertDialog;
 import android.content.DialogInterface;
-import android.os.Build;
 import android.os.Process;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -33,6 +32,7 @@ class OSInAppMessageController implements OSDynamicTriggerControllerObserver, OS
 
     public static final String IN_APP_MESSAGES_JSON_KEY = "in_app_messages";
     private static final String OS_SAVE_IN_APP_MESSAGE = "OS_SAVE_IN_APP_MESSAGE";
+    private static final Object LOCK = new Object();
 
     OSTriggerController triggerController;
     private OSSystemConditionController systemConditionController;
@@ -130,20 +130,26 @@ void initWithCachedInAppMessages() {
         if (!messages.isEmpty())
             return;
 
-        String cachedIamsStr = OneSignalPrefs.getString(
+        String cachedInAppMessageString = OneSignalPrefs.getString(
                 OneSignalPrefs.PREFS_ONESIGNAL,
                 OneSignalPrefs.PREFS_OS_CACHED_IAMS,
                 null
         );
-        OneSignal.Log(OneSignal.LOG_LEVEL.DEBUG, "initWithCachedInAppMessages: " + cachedIamsStr);
+        OneSignal.Log(OneSignal.LOG_LEVEL.DEBUG, "initWithCachedInAppMessages: " + cachedInAppMessageString);
 
-        if (cachedIamsStr == null)
+        if (cachedInAppMessageString == null || cachedInAppMessageString.isEmpty())
             return;
 
-        try {
-            processInAppMessageJson(new JSONArray(cachedIamsStr));
-        } catch (JSONException e) {
-            e.printStackTrace();
+        synchronized (LOCK) {
+            try {
+                // Second check to avoid getting the lock while message list is being set
+                if (!messages.isEmpty())
+                    return;
+
+                processInAppMessageJson(new JSONArray(cachedInAppMessageString));
+            } catch (JSONException e) {
+                e.printStackTrace();
+            }
         }
     }
 
@@ -159,6 +165,7 @@ void receivedInAppMessageJson(@NonNull JSONArray json) throws JSONException {
                 json.toString());
 
         resetRedisplayMessagesBySession();
+
         processInAppMessageJson(json);
     }
 
@@ -169,14 +176,17 @@ private void resetRedisplayMessagesBySession() {
     }
 
     private void processInAppMessageJson(@NonNull JSONArray json) throws JSONException {
-        ArrayList<OSInAppMessage> newMessages = new ArrayList<>();
-        for (int i = 0; i < json.length(); i++) {
-            JSONObject messageJson = json.getJSONObject(i);
-            OSInAppMessage message = new OSInAppMessage(messageJson);
+        synchronized (LOCK) {
+            ArrayList<OSInAppMessage> newMessages = new ArrayList<>();
+            for (int i = 0; i < json.length(); i++) {
+                JSONObject messageJson = json.getJSONObject(i);
+                OSInAppMessage message = new OSInAppMessage(messageJson);
+
+                newMessages.add(message);
+            }
 
-            newMessages.add(message);
+            messages = newMessages;
         }
-        messages = newMessages;
 
         evaluateInAppMessages();
     }
@@ -774,6 +784,7 @@ private void makeRedisplayMessagesAvailableWithTriggers(Collection<String> newTr
         for (OSInAppMessage message : messages) {
             if (!message.isTriggerChanged() && redisplayedInAppMessages.contains(message) &&
                     triggerController.isTriggerOnMessage(message, newTriggersKeys)) {
+                OneSignal.onesignalLog(OneSignal.LOG_LEVEL.DEBUG, "Trigger changed for message: " + message.toString());
                 message.setTriggerChanged(true);
             }
         }
@@ -787,12 +798,14 @@ private void makeRedisplayMessagesAvailableWithTriggers(Collection<String> newTr
      * conditions have changed.
      */
     void addTriggers(Map<String, Object> newTriggers) {
+        OneSignal.onesignalLog(OneSignal.LOG_LEVEL.DEBUG, "Add trigger called with: " + newTriggers.toString());
         triggerController.addTriggers(newTriggers);
         makeRedisplayMessagesAvailableWithTriggers(newTriggers.keySet());
         evaluateInAppMessages();
     }
 
     void removeTriggersForKeys(Collection<String> keys) {
+        OneSignal.onesignalLog(OneSignal.LOG_LEVEL.DEBUG, "Remove trigger called with keys: " + keys);
         triggerController.removeTriggersForKeys(keys);
         makeRedisplayMessagesAvailableWithTriggers(keys);
         evaluateInAppMessages();

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

@@ -172,6 +172,9 @@ private boolean triggerMatchesNumericValue(@NonNull Number triggerValue, @NonNul
      * If trigger key is part of message triggers, then return true, otherwise false
      * */
     boolean isTriggerOnMessage(OSInAppMessage message, Collection<String> newTriggersKeys) {
+        if (message.triggers == null)
+            return false;
+
         for (String triggerKey : newTriggersKeys) {
             for (ArrayList<OSTrigger> andConditions : message.triggers) {
                 for (OSTrigger trigger : andConditions) {

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

@@ -844,16 +844,16 @@ private static void handleAmazonPurchase() {
    // If the app is not in the foreground yet do not make an on_session call yet.
    // If we don't have a OneSignal player_id yet make the call to create it regardless of focus
    private static void doSessionInit() {
+      getInAppMessageController().initWithCachedInAppMessages();
       // Check session time to determine whether to start a new session or not
       if (isPastOnSessionTime()) {
-          OneSignalStateSynchronizer.setNewSession();
+         OneSignalStateSynchronizer.setNewSession();
          if (foreground) {
             outcomeEventsController.cleanOutcomes();
             sessionManager.restartSessionIfNeeded(getAppEntryState());
             getInAppMessageController().resetSessionLaunchTime();
          }
       } else if (foreground) {
-         getInAppMessageController().initWithCachedInAppMessages();
          sessionManager.attemptSessionUpgrade(getAppEntryState());
       }