Switching to constants keys from strings

Author: jkasten2

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

@@ -58,7 +58,7 @@
  * */
 class NotificationBundleProcessor {
 
-   private static final String PUSH_ADDITIONAL_DATA_KEY = "a";
+   public static final String PUSH_ADDITIONAL_DATA_KEY = "a";
 
    public static final String PUSH_MINIFIED_BUTTONS_LIST = "o";
    public static final String PUSH_MINIFIED_BUTTON_ID = "i";

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

@@ -11,8 +11,8 @@
 // Future: This class could also support parsing our SDK generated bundles
 class OSNotificationFormatHelper {
 
-    static final String PAYLOAD_OS_ROOT_CUSTOM = "custom";
-    private static final String PAYLOAD_OS_NOTIFICATION_ID = "i";
+    public static final String PAYLOAD_OS_ROOT_CUSTOM = "custom";
+    public static final String PAYLOAD_OS_NOTIFICATION_ID = "i";
 
     static boolean isOneSignalIntent(@Nullable Intent intent) {
         if (intent == null)

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

@@ -530,4 +530,6 @@ public static class JSONUtils extends com.onesignal.JSONUtils {
    public static class GenerateNotification extends com.onesignal.GenerateNotification {}
 
    public static class NotificationBundleProcessor extends com.onesignal.NotificationBundleProcessor {}
+
+   public static class OSNotificationFormatHelper extends com.onesignal.OSNotificationFormatHelper {}
 }

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

@@ -32,6 +32,9 @@
 
 import java.util.UUID;
 
+import static com.onesignal.OneSignalPackagePrivateHelper.NotificationBundleProcessor.PUSH_ADDITIONAL_DATA_KEY;
+import static com.onesignal.OneSignalPackagePrivateHelper.OSNotificationFormatHelper.PAYLOAD_OS_ROOT_CUSTOM;
+import static com.onesignal.OneSignalPackagePrivateHelper.OSNotificationFormatHelper.PAYLOAD_OS_NOTIFICATION_ID;
 import static com.onesignal.OneSignalPackagePrivateHelper.GenerateNotification.BUNDLE_KEY_ACTION_ID;
 import static com.onesignal.InAppMessagingHelpers.ONESIGNAL_APP_ID;
 import static com.test.onesignal.RestClientAsserts.assertNotificationOpenAtIndex;
@@ -57,6 +60,8 @@
 @RunWith(RobolectricTestRunner.class)
 public class NotificationOpenedActivityHMSIntegrationTestsRunner {
 
+    private static final String TEST_ACTION_ID = "myTestActionId";
+
     @BeforeClass // Runs only once, before any tests
     public static void setUpClass() throws Exception {
         ShadowLog.stream = System.out;
@@ -79,19 +84,19 @@ public void beforeEachTest() throws Exception {
     private static @NonNull Intent helper_basicOSHMSOpenIntent() throws JSONException {
         return helper_baseHMSOpenIntent()
                 .putExtra(
-                    "custom",
-                    new JSONObject() {{
-                        put("i", UUID.randomUUID().toString());
-                }}.toString()
+                        PAYLOAD_OS_ROOT_CUSTOM,
+                        new JSONObject() {{
+                            put(PAYLOAD_OS_NOTIFICATION_ID, UUID.randomUUID().toString());
+                        }}.toString()
         );
     }
 
     private static @NonNull Intent helper_basicOSHMSOpenIntentWithActionId(final @NonNull String actionId) throws JSONException {
         return helper_baseHMSOpenIntent()
                 .putExtra(
-                        "custom",
+                        PAYLOAD_OS_ROOT_CUSTOM,
                         new JSONObject() {{
-                            put("i", UUID.randomUUID().toString());
+                            put(PAYLOAD_OS_NOTIFICATION_ID, UUID.randomUUID().toString());
                             put(BUNDLE_KEY_ACTION_ID, actionId);
                         }}.toString()
                 );
@@ -139,7 +144,6 @@ public void barebonesOSPayload_makesNotificationOpenRequest() throws Exception {
         assertNotificationOpenAtIndex(1, UserState.DEVICE_TYPE_HUAWEI);
     }
 
-    private static final String TEST_ACTION_ID = "myTestActionId";
     private static String lastActionId;
     @Test
     public void firesOSNotificationOpenCallbackWithActionId() throws Exception {
@@ -163,10 +167,10 @@ public void osIAMPreview_showsPreview() throws Exception {
 
         Intent intent = helper_baseHMSOpenIntent()
                 .putExtra(
-                        "custom",
+                        PAYLOAD_OS_ROOT_CUSTOM,
                         new JSONObject() {{
-                            put("i", UUID.randomUUID().toString());
-                            put("a", new JSONObject() {{
+                            put(PAYLOAD_OS_NOTIFICATION_ID, UUID.randomUUID().toString());
+                            put(PUSH_ADDITIONAL_DATA_KEY, new JSONObject() {{
                                 put("os_in_app_message_preview_id", "UUID");
                             }});
                         }}.toString()