Merge pull request #332 from Iterable/MOB-2762-BUG-fix-In-App-Read-State

[MOB-2762] - Bug fix - In App read state

Author: Ayyanchira

iterableapi/src/main/java/com/iterable/iterableapi/IterableInAppManager.java

@@ -181,6 +181,8 @@ public void execute(String payload) {
                     } catch (JSONException e) {
                         IterableLogger.e(TAG, e.toString());
                     }
+                } else {
+                    scheduleProcessing();
                 }
             }
         });
@@ -428,9 +430,10 @@ private void handleIterableCustomAction(String actionName, IterableInAppMessage
 
     @Override
     public void onSwitchToForeground() {
-        scheduleProcessing();
         if (IterableUtil.currentTimeMillis() - lastSyncTime > MOVE_TO_FOREGROUND_SYNC_INTERVAL_MS) {
             syncInApp();
+        } else {
+            scheduleProcessing();
         }
     }
 

iterableapi/src/test/java/com/iterable/iterableapi/IterableInAppManagerTest.java

@@ -163,15 +163,14 @@ public void testReset() throws Exception {
     @Test
     public void testProcessAfterForeground() throws Exception {
         dispatcher.enqueueResponse("/inApp/getMessages", new MockResponse().setBody(IterableTestUtils.getResourceString("inapp_payload_single.json")));
-        IterableInAppManager inAppManager = IterableApi.getInstance().getInAppManager();
-        assertEquals(0, inAppManager.getMessages().size());
 
-        inAppManager.syncInApp();
+        ActivityController<Activity> activityController = Robolectric.buildActivity(Activity.class).create().start().resume();
         shadowOf(getMainLooper()).idle();
-        assertEquals(1, inAppManager.getMessages().size());
+        shadowOf(getMainLooper()).runToEndOfTasks();
 
-        ActivityController<Activity> activityController = Robolectric.buildActivity(Activity.class).create().start().resume();
+        IterableInAppManager inAppManager = IterableApi.getInstance().getInAppManager();
         shadowOf(getMainLooper()).idle();
+        assertEquals(1, inAppManager.getMessages().size());
 
         ArgumentCaptor<IterableInAppMessage> inAppMessageCaptor = ArgumentCaptor.forClass(IterableInAppMessage.class);
         verify(inAppHandler).onNewInApp(inAppMessageCaptor.capture());

iterableapi/src/test/java/com/iterable/iterableapi/IterableInboxTest.java

@@ -127,13 +127,9 @@ public IterableConfig.Builder run(IterableConfig.Builder builder) {
                 return builder.setInAppHandler(inAppHandler).setCustomActionHandler(customActionHandler).setUrlHandler(urlHandler);
             }
         });
-        inAppManager.syncInApp();
-        shadowOf(getMainLooper()).idle();
-
-        assertEquals(2, inAppManager.getInboxMessages().size());
-        assertEquals(2, inAppManager.getUnreadInboxMessagesCount());
 
         Robolectric.buildActivity(Activity.class).create().start().resume();
+        shadowOf(getMainLooper()).idle();
 
         verify(inAppDisplayerMock).showMessage(any(IterableInAppMessage.class), eq(IterableInAppLocation.IN_APP), any(IterableHelper.IterableUrlCallback.class));
 

iterableapi/src/test/resources/inapp_payload_inbox_show.json

@@ -2,6 +2,7 @@
   "inAppMessages": [
     {
       "messageId": "message1",
+      "read": false,
       "trigger": {
         "type": "immediate"
       },
@@ -28,6 +29,7 @@
       }
     },{
       "messageId": "message2",
+      "read": false,
       "trigger": {
         "type": "immediate"
       },

iterableapi/src/test/resources/inapp_payload_single.json

@@ -3,6 +3,7 @@
     {
       "messageId": "7kx2MmoGdCpuZao9fDueuQoXVAZuDaVV",
       "expiresAt": 1949157312395,
+      "read": false,
       "trigger": {
         "type": "immediate"
       },