Improve code after rebasing

  * Remove IAMController Shadow from testing
  * Changes parts of IAMSController

Author: Jeasmine

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

@@ -48,16 +48,16 @@ class OSInAppMessageController implements OSDynamicTriggerControllerObserver, OS
     // IAM clicks that have been successfully posted to our backend and should not be counted again
     @NonNull final private Set<String> clickedClickIds;
     // Ordered IAMs queued to display, includes the message currently displaying, if any.
-    @NonNull final ArrayList<OSInAppMessage> messageDisplayQueue;
+    @NonNull final private ArrayList<OSInAppMessage> messageDisplayQueue;
     // IAMs displayed with last displayed time and quantity of displays data
     // This is retrieved from a DB Table that take care of each object to be unique
     @NonNull private List<OSInAppMessage> redisplayedInAppMessages;
 
-    boolean inAppMessagingEnabled = true;
-    boolean inAppMessageShowing = false;
+    private boolean inAppMessagingEnabled = true;
+    private boolean inAppMessageShowing = false;
 
     @Nullable Date lastTimeInAppDismissed;
-    int htmlNetworkRequestAttemptCount = 0;
+    private int htmlNetworkRequestAttemptCount = 0;
 
     @Nullable private static OSInAppMessageController sharedInstance;
     public static OSInAppMessageController getController() {
@@ -74,7 +74,7 @@ public static OSInAppMessageController getController() {
         return sharedInstance;
     }
 
-    protected OSInAppMessageController(OneSignalDbHelper dbInstance) {
+    protected OSInAppMessageController(OneSignalDbHelper dbHelper) {
         messages = new ArrayList<>();
         dismissedMessages = OSUtils.newConcurrentSet();
         messageDisplayQueue = new ArrayList<>();
@@ -107,11 +107,11 @@ protected OSInAppMessageController(OneSignalDbHelper dbInstance) {
         if (tempClickedMessageIdsSet != null)
             clickedClickIds.addAll(tempClickedMessageIdsSet);
 
-        initRedisplayData(dbInstance);
+        initRedisplayData(dbHelper);
     }
 
-    void initRedisplayData(OneSignalDbHelper dbInstance) {
-        inAppMessageRepository = new OSInAppMessageRepository(dbInstance);
+    protected void initRedisplayData(OneSignalDbHelper dbHelper) {
+        inAppMessageRepository = new OSInAppMessageRepository(dbHelper);
         redisplayedInAppMessages = inAppMessageRepository.getRedisplayedInAppMessages();
 
         OneSignal.Log(OneSignal.LOG_LEVEL.DEBUG, "redisplayedInAppMessages: " + redisplayedInAppMessages.toString());
@@ -143,7 +143,7 @@ void initWithCachedInAppMessages() {
 
     /**
      * Called after the device is registered from UserStateSynchronizer
-     *  which is the REST call to create the player record on_session
+     * which is the REST call to create the player record on_session
      */
     void receivedInAppMessageJson(@NonNull JSONArray json) throws JSONException {
         // Cache copy for quick cold starts
@@ -402,7 +402,7 @@ private void setDataForRedisplay(OSInAppMessage message) {
     private void queueMessageForDisplay(@NonNull OSInAppMessage message) {
         synchronized (messageDisplayQueue) {
             // Make sure no message is ever added to the queue more than once
-            if (!isInAppMessageQueued(message)) {
+            if (!messageDisplayQueue.contains(message)) {
                 messageDisplayQueue.add(message);
                 OneSignal.onesignalLog(OneSignal.LOG_LEVEL.DEBUG, "In app message with id, " + message.messageId + ", added to the queue");
             }
@@ -420,17 +420,6 @@ private void queueMessageForDisplay(@NonNull OSInAppMessage message) {
         }
     }
 
-    /**
-     * Check the messageDisplayQueue for the message by messageId
-     */
-    private boolean isInAppMessageQueued(OSInAppMessage message) {
-        for (OSInAppMessage inAppMessage : messageDisplayQueue) {
-            if (message.messageId.equals(inAppMessage.messageId))
-                return true;
-        }
-        return false;
-    }
-
     boolean isInAppMessageShowing() {
         return inAppMessageShowing;
     }
@@ -467,8 +456,7 @@ void messageWasDismissed(@NonNull OSInAppMessage message) {
     private void dismissCurrentMessage() {
         synchronized (messageDisplayQueue) {
             if (messageDisplayQueue.size() > 0) {
-                String removedMessageId = messageDisplayQueue.get(0).messageId;
-                messageDisplayQueue.remove(0);
+                String removedMessageId = messageDisplayQueue.remove(0).messageId;
                 OneSignal.onesignalLog(OneSignal.LOG_LEVEL.DEBUG, "In app message with id, " + removedMessageId + ", dismissed (removed) from the queue!");
             }
 
@@ -522,7 +510,7 @@ public void run() {
         return "in_app_messages/" + message.messageId + "/variants/" + variantId + "/html?app_id=" + OneSignal.appId;
     }
 
-    public void displayMessage(@NonNull final OSInAppMessage message) {
+    private void displayMessage(@NonNull final OSInAppMessage message) {
         if (!inAppMessagingEnabled) {
             OneSignal.onesignalLog(OneSignal.LOG_LEVEL.VERBOSE, "In app messaging is currently paused, iam will not be shown!");
             return;
@@ -614,9 +602,9 @@ public void messageTriggerConditionChanged() {
     }
 
     /**
-     *  Part of redisplay logic
+     * Part of redisplay logic
      *
-     *  Make all messages with redisplay available if:
+     * Make all messages with redisplay available if:
      *   - Already displayed
      *   - At least one Trigger has changed
      */
@@ -630,10 +618,11 @@ private void makeRedisplayMessagesAvailableWithTriggers(Collection<String> newTr
     }
 
     /**
-     *  Trigger logic
-     *  These methods mostly pass data to the Trigger Controller, but also cause the SDK to
-     *  re-evaluate messages to see if we should display a message now that the trigger
-     *  conditions have changed.
+     * Trigger logic
+     *
+     * These methods mostly pass data to the Trigger Controller, but also cause the SDK to
+     * re-evaluate messages to see if we should display/redisplay a message now that the trigger
+     * conditions have changed.
      */
     void addTriggers(Map<String, Object> newTriggers) {
         triggerController.addTriggers(newTriggers);
@@ -657,4 +646,14 @@ void setInAppMessagingEnabled(boolean enabled) {
     Object getTriggerValue(String key) {
         return triggerController.getTriggerValue(key);
     }
+
+    @NonNull
+    public ArrayList<OSInAppMessage> getInAppMessageDisplayQueue() {
+        return messageDisplayQueue;
+    }
+
+    @NonNull
+    public List<OSInAppMessage> getRedisplayedInAppMessages() {
+        return redisplayedInAppMessages;
+    }
 }

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

@@ -22,7 +22,7 @@ class OSInAppMessageDummyController extends OSInAppMessageController {
     }
 
     @Override
-    void initRedisplayData(OneSignalDbHelper dbInstance) {
+    public void initRedisplayData(OneSignalDbHelper dbHelper) {
     }
 
     @Override

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

@@ -32,9 +32,7 @@ public static void resetSessionLaunchTime() {
 
     public static void clearTestState() {
         OneSignal.pauseInAppMessages(false);
-        ShadowOSInAppMessageController.displayedMessages.clear();
-        ShadowOSInAppMessageController.dismissedMessages.clear();
-        OSInAppMessageController.getController().messageDisplayQueue.clear();
+        OSInAppMessageController.getController().getInAppMessageDisplayQueue().clear();
     }
 
     // Convenience method that wraps an object in a JSON Array

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

@@ -16,6 +16,8 @@
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -458,7 +460,24 @@ public static String getShowingInAppMessageId() {
    }
 
    public static ArrayList<com.onesignal.OSInAppMessage> getInAppMessageDisplayQueue() {
-      return com.onesignal.OSInAppMessageController.getController().messageDisplayQueue;
+      return com.onesignal.OSInAppMessageController.getController().getInAppMessageDisplayQueue();
+   }
+
+   public static List<OSTestInAppMessage> getRedisplayInAppMessages() {
+      List<OSInAppMessage> messages = com.onesignal.OSInAppMessageController.getController().getRedisplayedInAppMessages();
+      List<OSTestInAppMessage> testMessages = new ArrayList<>();
+
+      for (OSInAppMessage message : messages) {
+         try {
+            OSTestInAppMessage testInAppMessage = new OSTestInAppMessage(message);
+            testInAppMessage.getDisplayStats().setDisplayStats(message.getDisplayStats());
+            testMessages.add(testInAppMessage);
+
+         } catch (JSONException e) {
+            e.printStackTrace();
+         }
+      }
+      return testMessages;
    }
 
    public static class OSInAppMessageController {