Parsing loadContentHTML into OSInAppMessageContent object

Creating new object that will hold the HTML for an IAM as well as style information that will include margins, overlay color, and size.

Author: emawby

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

@@ -83,7 +83,7 @@ class OSInAppMessageController extends OSBackgroundManager implements OSDynamicT
     private String userTagsString = null;
 
     @Nullable
-    private String pendingHTMLContent = null;
+    private OSInAppMessageContent pendingMessageContent = null;
 
     private boolean waitForTags = false;
 
@@ -775,18 +775,26 @@ public void tagsAvailable(JSONObject tags) {
                     if (tags != null) {
                         userTagsString = tags.toString();
                     }
-                    if (pendingHTMLContent != null) {
+                    if (pendingMessageContent != null) {
                         if (!isPreview) {
                             OneSignal.getSessionManager().onInAppMessageReceived(message.messageId);
                         }
-                        WebViewManager.showHTMLString(message, taggedHTMLString(pendingHTMLContent));
-                        pendingHTMLContent = null;
+                        pendingMessageContent.setContentHtml(taggedHTMLString(pendingMessageContent.getContentHtml()));
+                        WebViewManager.showMessageContent(message, pendingMessageContent);
+                        pendingMessageContent = null;
                     }
                 }
             });
         }
     }
 
+    private OSInAppMessageContent parseMessageContentData(JSONObject data, OSInAppMessageInternal message) {
+        OSInAppMessageContent content = new OSInAppMessageContent(data);
+        double displayDuration = data.optDouble("display_duration");
+        message.setDisplayDuration(displayDuration);
+        return content;
+    }
+
     private void displayMessage(@NonNull final OSInAppMessageInternal message) {
         if (!inAppMessagingEnabled) {
             logger.verbose("In app messaging is currently paused, in app messages will not be shown!");
@@ -803,17 +811,19 @@ private void displayMessage(@NonNull final OSInAppMessageInternal message) {
                     public void onSuccess(String response) {
                         try {
                             JSONObject jsonResponse = new JSONObject(response);
-                            String htmlStr = jsonResponse.getString("html");
-
-                            double displayDuration = jsonResponse.optDouble("display_duration");
-                            message.setDisplayDuration(displayDuration);
+                            OSInAppMessageContent content =  parseMessageContentData(jsonResponse, message);
+                            if (content.getContentHtml() == null) {
+                                logger.debug("displayMessage:OnSuccess: No HTML retrieved from loadMessageContent");
+                                return;
+                            }
                             if (waitForTags) {
-                                pendingHTMLContent = htmlStr;
+                                pendingMessageContent = content;
                                 return;
                             }
                             OneSignal.getSessionManager().onInAppMessageReceived(message.messageId);
                             onMessageWillDisplay(message);
-                            WebViewManager.showHTMLString(message, taggedHTMLString(htmlStr));
+                            content.setContentHtml(taggedHTMLString(content.getContentHtml()));
+                            WebViewManager.showMessageContent(message, content);
                         } catch (JSONException e) {
                             e.printStackTrace();
                         }
@@ -858,16 +868,18 @@ void displayPreviewMessage(@NonNull String previewUUID) {
             public void onSuccess(String response) {
                 try {
                     JSONObject jsonResponse = new JSONObject(response);
-                    String htmlStr = jsonResponse.getString("html");
-
-                    double displayDuration = jsonResponse.optDouble("display_duration");
-                    message.setDisplayDuration(displayDuration);
+                    OSInAppMessageContent content =  parseMessageContentData(jsonResponse, message);
+                    if (content.getContentHtml() == null) {
+                        logger.debug("displayPreviewMessage:OnSuccess: No HTML retrieved from loadMessageContent");
+                        return;
+                    }
                     if (waitForTags) {
-                        pendingHTMLContent = htmlStr;
+                        pendingMessageContent = content;
                         return;
                     }
                     onMessageWillDisplay(message);
-                    WebViewManager.showHTMLString(message, taggedHTMLString(htmlStr));
+                    content.setContentHtml(taggedHTMLString(content.getContentHtml()));
+                    WebViewManager.showMessageContent(message, content);
                 } catch (JSONException e) {
                     e.printStackTrace();
                 }

OneSignalSDK/onesignal/src/main/java/com/onesignal/OSInAppMessageStyle.kt

@@ -0,0 +1,27 @@
+package com.onesignal
+
+import org.json.JSONObject
+
+const val HTML = "html"
+const val STYLE = "style"
+const val TOP_MARGIN = "top_margin"
+const val BOTTOM_MARGIN = "bottom_margin"
+const val LEFT_MARGIN = "left_margin"
+const val RIGHT_MARGIN = "right_margin"
+
+class OSInAppMessageContent constructor(jsonObject: JSONObject) {
+    var contentHtml: String? = null
+    var topMargin: Int = 1
+    var bottomMargin: Int = 1
+    var leftMargin: Int = 1
+    var rightMargin: Int = 1
+
+    init {
+        contentHtml = jsonObject.optString(HTML)
+        var style: JSONObject = jsonObject.optJSONObject(STYLE)
+        topMargin = style.optInt(TOP_MARGIN, 1)
+        bottomMargin = style.optInt(BOTTOM_MARGIN, 1)
+        leftMargin = style.optInt(LEFT_MARGIN, 1)
+        rightMargin = style.optInt(RIGHT_MARGIN, 1)
+    }
+}

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

@@ -87,9 +87,9 @@ protected WebViewManager(@NonNull OSInAppMessageInternal message, @NonNull Activ
      * Dismiss WebView if already showing one and the new one is a Preview
      *
      * @param message the message to show
-     * @param htmlStr the html to display on the WebView
+     * @param content the html to display on the WebView
      */
-    static void showHTMLString(@NonNull final OSInAppMessageInternal message, @NonNull final String htmlStr) {
+    static void showMessageContent(@NonNull final OSInAppMessageInternal message, @NonNull final OSInAppMessageContent content) {
         final Activity currentActivity = OneSignal.getCurrentActivity();
         OneSignal.onesignalLog(OneSignal.LOG_LEVEL.DEBUG, "in app message showHTMLString on currentActivity: " + currentActivity);
         /* IMPORTANT
@@ -103,11 +103,11 @@ static void showHTMLString(@NonNull final OSInAppMessageInternal message, @NonNu
                     @Override
                     public void onComplete() {
                         lastInstance = null;
-                        initInAppMessage(currentActivity, message, htmlStr);
+                        initInAppMessage(currentActivity, message, content.getContentHtml());
                     }
                 });
             } else {
-                initInAppMessage(currentActivity, message, htmlStr);
+                initInAppMessage(currentActivity, message, content.getContentHtml());
             }
             return;
         }
@@ -118,7 +118,7 @@ public void onComplete() {
         new Handler().postDelayed(new Runnable() {
             @Override
             public void run() {
-                showHTMLString(message, htmlStr);
+                showMessageContent(message, content);
             }
         }, IN_APP_MESSAGE_INIT_DELAY);
     }