matching json to backend spec change

Author: emawby

Examples/OneSignalDemo/local.properties

@@ -4,6 +4,6 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Tue Jul 23 19:22:28 PDT 2019
+#Wed Sep 09 11:15:20 PDT 2020
 ndk.dir=/Users/mikechoch/Library/Android/sdk/ndk-bundle
-sdk.dir=/Users/mikechoch/Library/Android/sdk
+sdk.dir=/Users/elliotmawby/Library/Android/sdk

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

@@ -17,7 +17,7 @@ public class OSInAppMessageAction {
     private static final String ID = "id";
     private static final String NAME = "name";
     private static final String URL = "url";
-    private static final String PAGE_ID = "page_id";
+    private static final String PAGE_ID = "pageId";
     private static final String URL_TARGET = "url_target";
     private static final String CLOSE = "close";
     private static final String CLICK_NAME = "click_name";

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

@@ -299,7 +299,7 @@ void onMessageActionOccurredOnMessage(@NonNull final OSInAppMessage message, @No
         firePublicClickHandler(message.messageId, action);
         beginProcessingPrompts(message, action.getPrompts());
         fireClickAction(action);
-        fireRESTCallForClick(message, action, action.getPageId());
+        fireRESTCallForClick(message, action);
         fireTagCallForClick(action);
         fireOutcomesForClick(message.messageId, action.getOutcomes());
     }
@@ -467,7 +467,7 @@ void onFailure(int statusCode, String response, Throwable throwable) {
         }
     }
 
-    private void fireRESTCallForClick(@NonNull final OSInAppMessage message, @NonNull final OSInAppMessageAction action, @Nullable final String pageId) {
+    private void fireRESTCallForClick(@NonNull final OSInAppMessage message, @NonNull final OSInAppMessageAction action) {
         final String variantId = variantIdForMessage(message);
         if (variantId == null)
             return;
@@ -491,7 +491,6 @@ private void fireRESTCallForClick(@NonNull final OSInAppMessage message, @NonNul
                 put("player_id", OneSignal.getUserId());
                 put("click_id", clickId);
                 put("variant_id", variantId);
-                if (pageId != null) { put("page_id", pageId); }
                 if (action.isFirstClick())
                     put("first_click", true);
             }};

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

@@ -4,8 +4,8 @@ package com.onesignal
 import org.json.JSONException
 import org.json.JSONObject
 
-const val PAGE_ID = "page_id"
-const val PAGE_INDEX = "page_index"
+const val PAGE_ID = "pageId"
+const val PAGE_INDEX = "pageIndex"
 
 class OSInAppMessagePage constructor(jsonObject: JSONObject) {
     var pageId: String? = null

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

@@ -108,6 +108,7 @@ class OneSignalPrefs {
     public static final String PREFS_OS_DISMISSED_IAMS = "PREFS_OS_DISPLAYED_IAMS";
     public static final String PREFS_OS_IMPRESSIONED_IAMS = "PREFS_OS_IMPRESSIONED_IAMS";
     public static final String PREFS_OS_CLICKED_CLICK_IDS_IAMS = "PREFS_OS_CLICKED_CLICK_IDS_IAMS";
+    public static final String PREFS_OS_PAGE_IMPRESSIONED_IAMS = "PREFS_OS_PAGE_IMPRESSIONED_IAMS";
 
     // Player Purchase Keys
     static final String PREFS_PURCHASE_TOKENS = "purchaseTokens";

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

@@ -238,11 +238,7 @@ private void handleActionTaken(JSONObject jsonObject) throws JSONException {
         }
 
         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);
-            }
+            OneSignal.getInAppMessageController().onPageChanged(message, jsonObject);
         }
     }
 

OneSignalSDK/unittest/src/test/java/com/onesignal/InAppMessagingHelpers.java

@@ -161,7 +161,7 @@ public static JSONObject buildTestActionJson() throws JSONException {
             put("url", "https://www.onesignal.com");
             put("url_target", "webview");
             put("close", true);
-            put("page_id", IAM_PAGE_ID);
+            put("pageId", IAM_PAGE_ID);
             put("data", new JSONObject() {{
                 put("test", "value");
             }});
@@ -170,8 +170,8 @@ public static JSONObject buildTestActionJson() throws JSONException {
 
     public static JSONObject buildTestPageJson() throws JSONException {
         return new JSONObject() {{
-            put("page_index", 1);
-            put("page_id", IAM_PAGE_ID);
+            put("pageIndex", 1);
+            put("pageId", IAM_PAGE_ID);
         }};
     }
 }