Merge pull request #85 from Iterable/feature/MOB-180-add-inAppDisplayInterval

[MOB-180] Add inAppDisplayInterval to IterableConfig

Author: vbabenkoru

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

@@ -109,7 +109,7 @@ public Bundle getPayloadData() {
      */
     public IterableInAppManager getInAppManager() {
         if (inAppManager == null) {
-            inAppManager = new IterableInAppManager(this, config.inAppHandler);
+            inAppManager = new IterableInAppManager(this, config.inAppHandler, config.inAppDisplayInterval);
         }
         return inAppManager;
     }

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

@@ -53,6 +53,12 @@ public class IterableConfig {
      */
     final IterableInAppHandler inAppHandler;
 
+    /**
+     * The number of seconds to wait before showing the next in-app message, if there are multiple
+     * messages in the queue
+     */
+    final double inAppDisplayInterval;
+
     private IterableConfig(Builder builder) {
         pushIntegrationName = builder.pushIntegrationName;
         urlHandler = builder.urlHandler;
@@ -62,6 +68,7 @@ private IterableConfig(Builder builder) {
         checkForDeferredDeeplink = builder.checkForDeferredDeeplink;
         logLevel = builder.logLevel;
         inAppHandler = builder.inAppHandler;
+        inAppDisplayInterval = builder.inAppDisplayInterval;
     }
 
     public static class Builder {
@@ -73,6 +80,7 @@ public static class Builder {
         private boolean checkForDeferredDeeplink;
         private int logLevel = Log.ERROR;
         private IterableInAppHandler inAppHandler = new IterableDefaultInAppHandler();
+        private double inAppDisplayInterval = 30.0;
 
         public Builder() {}
 
@@ -155,6 +163,16 @@ public Builder setInAppHandler(IterableInAppHandler inAppHandler) {
             return this;
         }
 
+        /**
+         * Set the in-app message display interval: the number of seconds to wait before showing
+         * the next in-app message, if there are multiple messages in the queue
+         * @param inAppDisplayInterval display interval in seconds
+         */
+        public Builder setInAppDisplayInterval(double inAppDisplayInterval) {
+            this.inAppDisplayInterval = inAppDisplayInterval;
+            return this;
+        }
+
         public IterableConfig build() {
             return new IterableConfig(this);
         }

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

@@ -28,29 +28,31 @@
  */
 public class IterableInAppManager implements IterableActivityMonitor.AppStateCallback {
     static final String TAG = "IterableInAppManager";
-    static final int IN_APP_DELAY_SECONDS = 30;
     static final long MOVE_TO_FOREGROUND_SYNC_INTERVAL_MS = 60 * 1000;
 
     private final IterableApi api;
     private final Context context;
     private final IterableInAppStorage storage;
     private final IterableInAppHandler handler;
+    private final double inAppDisplayInterval;
 
     private long lastSyncTime = 0;
     private long lastInAppShown = 0;
 
-    IterableInAppManager(IterableApi iterableApi, IterableInAppHandler handler) {
+    IterableInAppManager(IterableApi iterableApi, IterableInAppHandler handler, double inAppDisplayInterval) {
         this(iterableApi,
                 handler,
+                inAppDisplayInterval,
                 new IterableInAppFileStorage(iterableApi.getMainActivityContext()),
                 IterableActivityMonitor.getInstance());
     }
 
     @VisibleForTesting
-    IterableInAppManager(IterableApi iterableApi, IterableInAppHandler handler, IterableInAppStorage storage, IterableActivityMonitor activityMonitor) {
+    IterableInAppManager(IterableApi iterableApi, IterableInAppHandler handler, double inAppDisplayInterval, IterableInAppStorage storage, IterableActivityMonitor activityMonitor) {
         this.api = iterableApi;
         this.context = iterableApi.getMainActivityContext();
         this.handler = handler;
+        this.inAppDisplayInterval = inAppDisplayInterval;
         this.storage = storage;
         activityMonitor.addCallback(this);
     }
@@ -222,20 +224,20 @@ void scheduleProcessing() {
                 public void run() {
                     processMessages();
                 }
-            }, (IN_APP_DELAY_SECONDS - getSecondsSinceLastInApp() + 2) * 1000);
+            }, (long) ((inAppDisplayInterval - getSecondsSinceLastInApp() + 2.0) * 1000));
         }
     }
 
     private boolean isShowingInApp() {
         return IterableInAppHTMLNotification.getInstance() != null;
     }
 
-    private int getSecondsSinceLastInApp() {
-        return (int) ((IterableUtil.currentTimeMillis() - lastInAppShown) / 1000);
+    private double getSecondsSinceLastInApp() {
+        return (IterableUtil.currentTimeMillis() - lastInAppShown) / 1000.0;
     }
 
     private boolean canShowInAppAfterPrevious() {
-        return getSecondsSinceLastInApp() >= IN_APP_DELAY_SECONDS;
+        return getSecondsSinceLastInApp() >= inAppDisplayInterval;
     }
 
     /**

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

@@ -35,7 +35,7 @@ public class IterableInAppManagerSyncTest extends BaseTest {
     @Before
     public void setUp() throws Exception {
         MockitoAnnotations.initMocks(this);
-        inAppManager = spy(new IterableInAppManager(iterableApiMock, handlerMock, storageMock, activityMonitorMock));
+        inAppManager = spy(new IterableInAppManager(iterableApiMock, handlerMock, 30.0, storageMock, activityMonitorMock));
         doAnswer(new Answer() {
             @Override
             public Object answer(InvocationOnMock invocation) throws Throwable {