firing onPageChanged from json event

Author: emawby

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

@@ -281,7 +281,8 @@ void onFailure(int statusCode, String response, Throwable throwable) {
         }
     }
 
-    void onPageChanged(@NonNull final OSInAppMessage message, @NonNull final OSInAppMessagePage newPage) {
+    void onPageChanged(@NonNull final OSInAppMessage message, @NonNull final JSONObject messageJson) {
+        final OSInAppMessagePage newPage = new OSInAppMessagePage(messageJson);
         if (message.isPreview) {
             return;
         }

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

@@ -155,6 +155,7 @@ class OSJavaScriptInterface {
         static final String EVENT_TYPE_KEY = "type";
         static final String EVENT_TYPE_RENDERING_COMPLETE = "rendering_complete";
         static final String EVENT_TYPE_ACTION_TAKEN = "action_taken";
+        static final String EVENT_TYPE_PAGE_CHANGE = "page_change";
 
         static final String IAM_DISPLAY_LOCATION_KEY = "displayLocation";
         static final String IAM_PAGE_META_DATA_KEY = "pageMetaData";
@@ -168,11 +169,20 @@ public void postMessage(String message) {
                 JSONObject jsonObject = new JSONObject(message);
                 String messageType = jsonObject.getString(EVENT_TYPE_KEY);
 
-                if (messageType.equals(EVENT_TYPE_RENDERING_COMPLETE))
-                    handleRenderComplete(jsonObject);
-                else if (messageType.equals(EVENT_TYPE_ACTION_TAKEN) && !messageView.isDragging()) {
-                    // Added handling so that click actions won't trigger while dragging the IAM
-                    handleActionTaken(jsonObject);
+                switch (messageType) {
+                    case EVENT_TYPE_RENDERING_COMPLETE:
+                        handleRenderComplete(jsonObject);
+                        break;
+                    case EVENT_TYPE_ACTION_TAKEN:
+                        // Added handling so that click actions won't trigger while dragging the IAM
+                        if (!messageView.isDragging())
+                            handleActionTaken(jsonObject);
+                        break;
+                    case EVENT_TYPE_PAGE_CHANGE:
+                        handlePageChange(jsonObject);
+                        break;
+                    default:
+                        break;
                 }
             } catch (JSONException e) {
                 e.printStackTrace();
@@ -226,6 +236,14 @@ private void handleActionTaken(JSONObject jsonObject) throws JSONException {
             if (close)
                 dismissAndAwaitNextMessage(null);
         }
+
+        private void handlePageChange(JSONObject jsonObject) throws JSONException {
+            JSONObject body = jsonObject.getJSONObject("body");
+            String id = body.optString("id", null);
+            if (id != null) {
+                OneSignal.getInAppMessageController().onPageChanged(message, body);
+            }
+        }
     }
 
     private static int pageRectToViewHeight(final @NonNull Activity activity, @NonNull JSONObject jsonObject) {