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

# Conflicts:
#	iterableapi/src/main/java/com/iterable/iterableapi/IterableConfig.java

Author: “Akshay

iterableapi/build.gradle

@@ -50,11 +50,13 @@ dependencies {
     testImplementation 'androidx.test.ext:junit:1.1.2'
     testImplementation 'androidx.test:rules:1.3.0'
     testImplementation 'org.mockito:mockito-core:3.3.3'
+    testImplementation 'org.mockito:mockito-inline:2.8.47'
     testImplementation 'org.robolectric:robolectric:4.4'
     testImplementation 'org.robolectric:shadows-playservices:4.4'
     testImplementation 'org.khronos:opengl-api:gl1.1-android-2.1_r1'
     testImplementation 'com.squareup.okhttp3:mockwebserver:4.2.2'
     testImplementation 'org.skyscreamer:jsonassert:1.5.0'
+    testImplementation project(path: ':iterableapi')
     androidTestImplementation 'androidx.test:runner:1.3.0'
     androidTestImplementation 'androidx.test:rules:1.3.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
@@ -96,6 +98,8 @@ task javadoc(type: Javadoc) {
     source = android.sourceSets.main.java.srcDirs
     excludes = ['**/*.kt']
     classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+
+    exclude '**/*.kt'
 }
 
 tasks.withType(Test) {

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

@@ -42,6 +42,7 @@ public class IterableApi {
 
     IterableApiClient apiClient = new IterableApiClient(new IterableApiAuthProvider());
     private @Nullable IterableInAppManager inAppManager;
+    private @Nullable IterableEmbeddedManager embeddedManager;
     private String inboxSessionId;
     private IterableAuthManager authManager;
     private HashMap<String, String> deviceAttributes = new HashMap<>();
@@ -517,6 +518,10 @@ public static void initialize(@NonNull Context context, @NonNull String apiKey,
                     sharedInstance.config.useInMemoryStorageForInApps);
         }
 
+        if (sharedInstance.embeddedManager == null) {
+            sharedInstance.embeddedManager = new IterableEmbeddedManager(sharedInstance.config.embeddedMessagingAutoFetchInterval, null, null);
+        }
+
         loadLastSavedConfiguration(context);
         IterablePushNotificationUtil.processPendingAction(context);
     }
@@ -535,12 +540,20 @@ public static void setContext(Context context) {
         this.inAppManager = inAppManager;
     }
 
+    @VisibleForTesting
+    IterableApi(IterableInAppManager inAppManager, IterableEmbeddedManager embeddedManager) {
+        config = new IterableConfig.Builder().build();
+        this.inAppManager = inAppManager;
+        this.embeddedManager = embeddedManager;
+    }
+
     @VisibleForTesting
     IterableApi(IterableApiClient apiClient, IterableInAppManager inAppManager) {
         config = new IterableConfig.Builder().build();
         this.apiClient = apiClient;
         this.inAppManager = inAppManager;
     }
+
 //endregion
 
 //region SDK public functions
@@ -558,6 +571,24 @@ 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) {
+            throw new RuntimeException("IterableApi must be initialized before calling getFlexManager(). " +
+                    "Make sure you call IterableApi#initialize() in Application#onCreate");
+        }
+        return embeddedManager;
+    }
+
     /**
      * Returns the attribution information ({@link IterableAttributionInfo}) for last push open
      * or app link click from an email.

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

@@ -215,6 +215,25 @@ public void getInAppMessages(int count, @NonNull IterableHelper.IterableActionHa
         }
     }
 
+    void getEmbeddedMessages(@NonNull IterableHelper.IterableActionHandler onCallback) {
+        JSONObject requestJSON = new JSONObject();
+        addEmailOrUserIdToJson(requestJSON);
+        try {
+            addEmailOrUserIdToJson(requestJSON);
+            requestJSON.put(IterableConstants.KEY_PLATFORM, IterableConstants.ITBL_PLATFORM_ANDROID);
+            requestJSON.put(IterableConstants.ITBL_KEY_SDK_VERSION, IterableConstants.ITBL_KEY_SDK_VERSION_NUMBER);
+            requestJSON.put(IterableConstants.ITBL_SYSTEM_VERSION, Build.VERSION.RELEASE);
+            requestJSON.put(IterableConstants.KEY_PACKAGE_NAME, authProvider.getContext().getPackageName());
+            //TODO: This will have to be replaced by either userID or email based on what the user is using
+            requestJSON.put("userKey", IterableApi.getInstance().getEmail());
+            requestJSON.put("placementId", "0");
+
+            sendGetRequest(IterableConstants.ENDPOINT_GET_EMBEDDED_MESSAGES, requestJSON, onCallback);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
+
     public void trackInAppOpen(@NonNull String messageId) {
         JSONObject requestJSON = new JSONObject();
 

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

@@ -79,6 +79,11 @@ public class IterableConfig {
 
     final boolean encryptionEnforced;
 
+    /**
+     * The number of seconds to wait before fetching the next embedded message
+     */
+    final double embeddedMessagingAutoFetchInterval;
+
     private IterableConfig(Builder builder) {
         pushIntegrationName = builder.pushIntegrationName;
         urlHandler = builder.urlHandler;
@@ -93,6 +98,7 @@ private IterableConfig(Builder builder) {
         allowedProtocols = builder.allowedProtocols;
         useInMemoryStorageForInApps = builder.useInMemoryStorageForInApps;
         encryptionEnforced = builder.encryptionEnforced;
+        embeddedMessagingAutoFetchInterval = builder.embeddedMessagingAutoFetchInterval;
     }
 
     public static class Builder {
@@ -110,6 +116,7 @@ public static class Builder {
         private boolean useInMemoryStorageForInApps = false;
         private boolean encryptionEnforced = false;
 
+        private double embeddedMessagingAutoFetchInterval = 30.0;
         public Builder() {}
 
         /**
@@ -246,6 +253,17 @@ public Builder setUseInMemoryStorageForInApps(boolean useInMemoryStorageForInApp
             return this;
         }
 
+        /**
+         * Set the embedded message auto fetch interval: the number of seconds to wait before fetching
+         * the next embedded message
+         * @param embeddedMessagingAutoFetchInterval display interval in seconds
+         */
+        @NonNull
+        public Builder setEmbeddedMessagingAutoFetchInterval(double embeddedMessagingAutoFetchInterval) {
+            this.embeddedMessagingAutoFetchInterval = embeddedMessagingAutoFetchInterval;
+            return this;
+        }
+
         @NonNull
         public IterableConfig build() {
             return new IterableConfig(this);

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

@@ -74,6 +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 PUSH_APP_ID                      = "IterableAppId";
     public static final String PUSH_GCM_PROJECT_NUMBER          = "GCMProjectNumber";
@@ -165,6 +166,30 @@ public final class IterableConstants {
     public static final String PICASSO_CLASS = "com.squareup.picasso.Picasso";
     public static final String LOCATION_HEADER_FIELD = "Location";
 
+    //Embedded Message Constants
+    public static final String ITERABLE_EMBEDDED_MESSAGE  = "embeddedMessages";
+    public static final String ITERABLE_EMBEDDED_MESSAGE_METADATA = "metadata";
+    public static final String ITERABLE_EMBEDDED_MESSAGE_ELEMENTS = "elements";
+    public static final String ITERABLE_EMBEDDED_MESSAGE_PAYLOAD = "payload";
+    public static final String ITERABLE_EMBEDDED_MESSAGE_ID = "id";
+    public static final String ITERABLE_EMBEDDED_MESSAGE_PLACEMENT_ID = "placementId";
+    public static final String ITERABLE_EMBEDDED_MESSAGE_CAMPAIGN_ID = "campaignId";
+    public static final String ITERABLE_EMBEDDED_MESSAGE_IS_PROOF = "isProof";
+    public static final String ITERABLE_EMBEDDED_MESSAGE_TITLE = "title";
+    public static final String ITERABLE_EMBEDDED_MESSAGE_BODY = "body";
+    public static final String ITERABLE_EMBEDDED_MESSAGE_MEDIA_URL = "mediaUrl";
+    public static final String ITERABLE_EMBEDDED_MESSAGE_DEFAULT_ACTION = "defaultAction";
+    public static final String ITERABLE_EMBEDDED_MESSAGE_BUTTONS = "buttons";
+    public static final String ITERABLE_EMBEDDED_MESSAGE_TEXT = "text";
+    public static final String ITERABLE_EMBEDDED_MESSAGE_DEFAULT_ACTION_TYPE = "type";
+    public static final String ITERABLE_EMBEDDED_MESSAGE_DEFAULT_ACTION_DATA = "data";
+    public static final String ITERABLE_EMBEDDED_MESSAGE_BUTTON_ID = "id";
+    public static final String ITERABLE_EMBEDDED_MESSAGE_BUTTON_TITLE = "title";
+    public static final String ITERABLE_EMBEDDED_MESSAGE_BUTTON_ACTION = "action";
+    public static final String ITERABLE_EMBEDDED_MESSAGE_TEXT_ID = "id";
+    public static final String ITERABLE_EMBEDDED_MESSAGE_TEXT_TEXT = "text";
+    public static final String ITERABLE_EMBEDDED_MESSAGE_TEXT_LABEL = "label";
+
     //In-App Constants
     public static final String ITERABLE_IN_APP_BGCOLOR_ALPHA    = "alpha";
     public static final String ITERABLE_IN_APP_BGCOLOR_HEX      = "hex";