Merge branch 'feature/embedded/manager' into Encryption-With-Embedded-Manager

Author: “Akshay

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

@@ -571,15 +571,6 @@ public IterableInAppManager getInAppManager() {
         return inAppManager;
     }
 
-    @NonNull
-    public IterableEmbeddedManager getEmbeddedManager() {
-        if (embeddedManager == null) {
-            throw new RuntimeException("IterableApi must be initialized before calling getFlexManager(). " +
-                    "Make sure you call IterableApi#initialize() in Application#onCreate");
-        }
-        return embeddedManager;
-    }
-
     @NonNull
     public IterableEmbeddedManager embeddedManager() {
         if (embeddedManager == null) {

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

@@ -74,7 +74,7 @@ public final class IterableConstants {
     public static final String ENDPOINT_UPDATE_USER_SUBS        = "users/updateSubscriptions";
     public static final String ENDPOINT_TRACK_INAPP_CLOSE       = "events/trackInAppClose";
     public static final String ENDPOINT_GET_REMOTE_CONFIGURATION = "mobile/getRemoteConfiguration";
-    public static final String ENDPOINT_GET_EMBEDDED_MESSAGES   = "flex/messages";
+    public static final String ENDPOINT_GET_EMBEDDED_MESSAGES   = "embedded-messaging/messages";
 
     public static final String PUSH_APP_ID                      = "IterableAppId";
     public static final String PUSH_GCM_PROJECT_NUMBER          = "GCMProjectNumber";

iterableapi/src/main/java/com/iterable/iterableapi/IterableEmbeddedManager.kt

@@ -202,29 +202,33 @@ public class IterableEmbeddedManager: IterableActivityMonitor.AppStateCallback{
 
     fun scheduleSync() {
         IterableLogger.printInfo()
-        if (canSyncEmbeddedMessages()) {
-            IterableLogger.v(TAG, "Can sync now.. Syncing now")
-            IterableLogger.v(TAG, "setting isSyncScheduled to false in first if")
-            getSyncedEmbeddedMessages()
+        if(autoFetchDuration > 0) {
+            if (canSyncEmbeddedMessages()) {
+                IterableLogger.v(TAG, "Can sync now.. Syncing now")
+                IterableLogger.v(TAG, "setting isSyncScheduled to false in first if")
+                getSyncedEmbeddedMessages()
 
-        } else {
-            if (!isAppInBackground) {
-                IterableLogger.v(
-                    TAG,
-                    "Scheduling sync after ${autoFetchDuration - getSecondsSinceLastFetch()} seconds"
-                )
-                Handler(Looper.getMainLooper()).postDelayed(
-                    {
-                        getSyncedEmbeddedMessages()
-                        IterableLogger.v(TAG, "inside looper setting isSyncScheduled to false")
-                    },
-                    ((autoFetchDuration - getSecondsSinceLastFetch()) * 1000).toLong()
-                )
-                IterableLogger.v(TAG, "setting isSyncScheduled to true")
             } else {
-                IterableLogger.v(TAG, "Not scheduling a sync.. App is in background")
-                lastSync = autoFetchDuration.toLong()
+                if (!isAppInBackground) {
+                    IterableLogger.v(
+                        TAG,
+                        "Scheduling sync after ${autoFetchDuration - getSecondsSinceLastFetch()} seconds"
+                    )
+                    Handler(Looper.getMainLooper()).postDelayed(
+                        {
+                            getSyncedEmbeddedMessages()
+                            IterableLogger.v(TAG, "inside looper setting isSyncScheduled to false")
+                        },
+                        ((autoFetchDuration - getSecondsSinceLastFetch()) * 1000).toLong()
+                    )
+                    IterableLogger.v(TAG, "setting isSyncScheduled to true")
+                } else {
+                    IterableLogger.v(TAG, "Not scheduling a sync.. App is in background")
+                    lastSync = autoFetchDuration.toLong()
+                }
             }
+        } else {
+            IterableLogger.v(TAG, "embedded messaging automatic fetching not started since autoFetchDuration is <= 0")
         }
     }
 
@@ -238,26 +242,6 @@ public class IterableEmbeddedManager: IterableActivityMonitor.AppStateCallback{
 
     // endregion
 
-    // region basic test methods
-
-    //For testing purpose only
-    fun getMessagesFromJson(): List<IterableEmbeddedMessage> {
-        val file = File("data.json")
-        val bufferedReader = file.bufferedReader()
-        val jsonString = bufferedReader.use { it.readText() }
-        val messageJson = JSONObject(jsonString)
-
-        val embeddedMessages = listOf(
-            IterableEmbeddedMessage.fromJSONObject(messageJson),
-            IterableEmbeddedMessage.fromJSONObject(messageJson),
-            IterableEmbeddedMessage.fromJSONObject(messageJson)
-        )
-
-        return embeddedMessages
-    }
-
-    // endregion
-
     // region IterableActivityMonitor.AppStateCallback
     override fun onSwitchToForeground() {
         IterableLogger.printInfo()