Remove OSNotificationPayload

* Remove already not in use OSNotificationPayload class
* Remove OSNotificationReceived.java file
* Rename NotificationID to NotificationId

Author: Jeasmine

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

@@ -367,16 +367,6 @@ private static void maximizeButtonsFromBundle(Bundle fcmBundle) {
         }
     }
 
-    static OSNotificationPayload OSNotificationPayloadFrom(JSONObject currentJsonPayload) {
-        JSONObject customJson = null;
-        try {
-            customJson = NotificationBundleProcessor.getCustomJSONObject(currentJsonPayload);
-        } catch (Throwable t) {
-            OneSignal.Log(OneSignal.LOG_LEVEL.ERROR, "Error assigning OSNotificationPayload values!", t);
-        }
-        return customJson == null ? new OSNotificationPayload() : OSNotificationPayload.OSNotificationPayloadFrom(currentJsonPayload, customJson);
-    }
-
     private static void processCollapseKey(OSNotificationGenerationJob notificationJob) {
         if (notificationJob.isRestoring())
             return;

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

@@ -221,7 +221,7 @@ OSNotification copy() {
               .setNotificationExtender(notificationExtender)
               .setGroupedNotifications(groupedNotifications)
               .setAndroidNotificationId(androidNotificationId)
-              .setNotificationID(notificationId)
+              .setNotificationId(notificationId)
               .setTemplateName(templateName)
               .setTemplateId(templateId)
               .setTitle(title)
@@ -533,7 +533,7 @@ public String toString() {
    }
 
    /**
-    * List of action buttons on the notification. Part of {@link OSNotificationPayload}.
+    * List of action buttons on the notification.
     */
    public static class ActionButton {
       private String id;
@@ -582,7 +582,7 @@ public String getIcon() {
    }
 
    /**
-    * If a background image was set, this object will be available. Part of {@link OSNotificationPayload}.
+    * If a background image was set, this object will be available.
     */
    public static class BackgroundImageLayout {
       private String image;
@@ -608,7 +608,7 @@ public static class OSNotificationBuilder {
       private List<OSNotification> groupedNotifications;
       private int androidNotificationId;
 
-      private String notificationID;
+      private String notificationId;
       private String templateName, templateId;
       private String title, body;
       private JSONObject additionalData;
@@ -647,8 +647,8 @@ public OSNotificationBuilder setAndroidNotificationId(int androidNotificationId)
          return this;
       }
 
-      public OSNotificationBuilder setNotificationID(String notificationID) {
-         this.notificationID = notificationID;
+      public OSNotificationBuilder setNotificationId(String notificationId) {
+         this.notificationId = notificationId;
          return this;
       }
 
@@ -762,7 +762,7 @@ public OSNotification build() {
          payload.setNotificationExtender(notificationExtender);
          payload.setGroupedNotifications(groupedNotifications);
          payload.setAndroidNotificationId(androidNotificationId);
-         payload.setNotificationId(notificationID);
+         payload.setNotificationId(notificationId);
          payload.setTemplateName(templateName);
          payload.setTemplateId(templateId);
          payload.setTitle(title);