Code cleaning

* Manifest service declaration is not needed anymore since we only depend on metadata
* Rename notificationID json key to notificationId
* Remove payload object from toJSONObject

Author: Jeasmine

Examples/OneSignalDemo/app/src/main/AndroidManifest.xml

@@ -19,16 +19,7 @@
         tools:ignore="GoogleAppIndexingWarning">
 
         <meta-data android:name="com.onesignal.NotificationServiceExtension"
-            android:value="com.onesignal.sdktest.notification.AppRemoteNotificationExtensionService" />
-
-        <service
-            android:name=".notification.NotificationServiceExtension"
-            android:permission="android.permission.BIND_JOB_SERVICE"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="com.onesignal.NotificationExtender" />
-            </intent-filter>
-        </service>
+            android:value="com.onesignal.sdktest.notification.NotificationServiceExtension" />
 
         <activity android:name=".activity.SplashActivity">
             <intent-filter>

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

@@ -116,9 +116,9 @@ static void processFromFCMIntentService(Context context, BundleCompat bundle) {
      *  in the event where you want to mark a notification as opened or displayed different than the defaults
      */
     @WorkerThread
-    static int processJobForDisplay(OSNotificationGenerationJob notificationJob, boolean callForegroundLogic) {
+    static int processJobForDisplay(OSNotificationGenerationJob notificationJob, boolean fromBackgroundLogic) {
         OSNotificationController notificationController = new OSNotificationController(notificationJob, notificationJob.isRestoring(), true);
-        return processJobForDisplay(notificationController, false, callForegroundLogic);
+        return processJobForDisplay(notificationController, false, fromBackgroundLogic);
     }
 
     @WorkerThread

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

@@ -464,39 +464,35 @@ public JSONObject toJSONObject() {
             mainObj.put("groupedNotifications", payloadJsonArray);
          }
 
-         JSONObject payload = new JSONObject();
-
-         payload.put("notificationID", notificationId);
-         payload.put("title", title);
-         payload.put("body", body);
-         payload.put("smallIcon", smallIcon);
-         payload.put("largeIcon", largeIcon);
-         payload.put("bigPicture", bigPicture);
-         payload.put("smallIconAccentColor", smallIconAccentColor);
-         payload.put("launchURL", launchURL);
-         payload.put("sound", sound);
-         payload.put("ledColor", ledColor);
-         payload.put("lockScreenVisibility", lockScreenVisibility);
-         payload.put("groupKey", groupKey);
-         payload.put("groupMessage", groupMessage);
-         payload.put("fromProjectNumber", fromProjectNumber);
-         payload.put("collapseId", collapseId);
-         payload.put("priority", priority);
+         mainObj.put("notificationId", notificationId);
+         mainObj.put("title", title);
+         mainObj.put("body", body);
+         mainObj.put("smallIcon", smallIcon);
+         mainObj.put("largeIcon", largeIcon);
+         mainObj.put("bigPicture", bigPicture);
+         mainObj.put("smallIconAccentColor", smallIconAccentColor);
+         mainObj.put("launchURL", launchURL);
+         mainObj.put("sound", sound);
+         mainObj.put("ledColor", ledColor);
+         mainObj.put("lockScreenVisibility", lockScreenVisibility);
+         mainObj.put("groupKey", groupKey);
+         mainObj.put("groupMessage", groupMessage);
+         mainObj.put("fromProjectNumber", fromProjectNumber);
+         mainObj.put("collapseId", collapseId);
+         mainObj.put("priority", priority);
 
          if (additionalData != null)
-            payload.put("additionalData", additionalData);
+            mainObj.put("additionalData", additionalData);
 
          if (actionButtons != null) {
             JSONArray actionButtonJsonArray = new JSONArray();
             for (ActionButton actionButton : actionButtons) {
                actionButtonJsonArray.put(actionButton.toJSONObject());
             }
-            payload.put("actionButtons", actionButtonJsonArray);
+            mainObj.put("actionButtons", actionButtonJsonArray);
          }
 
-         payload.put("rawPayload", rawPayload);
-
-         mainObj.put("payload", payload);
+         mainObj.put("rawPayload", rawPayload);
       }
       catch(JSONException e) {
          e.printStackTrace();

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

@@ -46,6 +46,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.WorkerThread;
+import androidx.core.app.NotificationCompat;
 
 import com.onesignal.OneSignalDbContract.NotificationTable;
 import com.onesignal.influence.data.OSTrackerFactory;
@@ -134,18 +135,15 @@ public boolean isAppClose() {
    }
 
    /**
-    * Meant to be implemented within a custom made NotificationExtensionService
-    * Naming can be whatever makes the most sense to the developer, but to actually activate any
-    *    implemented interfaces, a metadata tag with a specific OneSignal key and then file path value
-    *    must be added to the apps AndroidManifest.xml
-    *       ex. <meta-data android:name="com.onesignal.NotificationServiceExtension" android:value="com.company.ExtensionService" />
+    * Implement this interface on a class with a default public constructor and provide class with namespace
+    * as a value to a new `meta-data` tag with the key name of "com.onesignal.NotificationServiceExtension" in
+    * your AndroidManifest.xml.
+    *    ex. <meta-data android:name="com.onesignal.NotificationServiceExtension" android:value="com.company.MyNotificationExtensionService" />
     * <br/><br/>
-    * Allows for modification of a notifications payload by creating a {@link OSNotificationController.OverrideSettings}
-    *    instance and passing it into {@link OSNotificationReceivedEvent#setModifiedContent(OSNotificationController.OverrideSettings)}
-    * To display the notification, call {@link OSNotificationReceivedEvent#display()}
-    * Finally, to notify the SDK that the processing work is done, call {@link OSNotificationReceivedEvent#complete()}
-    * <br/><br/>
-    * TODO: Update docs with new OSRemoteNotificationReceivedHandler, this would be replacing the old NotificationExtenderService
+    * Allows for modification of a notification by calling {@link OSNotification#mutableCopy}
+    *    instance and passing it into {@link OSMutableNotification#setExtender(NotificationCompat.Extender)}
+    * To display the notification, call {@link OSNotificationReceivedEvent#complete(OSNotification)} with a notification instance.
+    * To omit displaying a notification call {@link OSNotificationReceivedEvent#complete(OSNotification)} with null.
     */
    public interface OSRemoteNotificationReceivedHandler {
 

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

@@ -3865,11 +3865,11 @@ public void testOSNotificationToJSONObject() throws Exception {
 
       JSONObject testJsonObj = osNotification.toJSONObject();
 
-      assertEquals("msg_body", testJsonObj.optJSONObject("payload").optString("body"));
-      JSONObject firstActionButton = (JSONObject)testJsonObj.optJSONObject("payload").optJSONArray("actionButtons").get(0);
+      assertEquals("msg_body", testJsonObj.optString("body"));
+      JSONObject firstActionButton = (JSONObject)testJsonObj.optJSONArray("actionButtons").get(0);
       assertEquals("text", firstActionButton.optString("text"));
 
-      JSONObject additionalData = testJsonObj.optJSONObject("payload").optJSONObject("additionalData");
+      JSONObject additionalData = testJsonObj.optJSONObject("additionalData");
       assertEquals("bar", additionalData.optString("foo"));
    }
 
@@ -3880,11 +3880,11 @@ public void testOSNotificationOpenResultToJSONObject() throws Exception {
 
       JSONObject testJsonObj = osNotificationOpenedResult.toJSONObject();
 
-      JSONObject additionalData = testJsonObj.optJSONObject("notification").optJSONObject("payload").optJSONObject("additionalData");
+      JSONObject additionalData = testJsonObj.optJSONObject("notification").optJSONObject("additionalData");
       assertEquals("bar", additionalData.optString("foo"));
 
       JSONObject firstGroupedNotification = (JSONObject)testJsonObj.optJSONObject("notification").optJSONArray("groupedNotifications").get(0);
-      assertEquals("collapseId1", firstGroupedNotification.optJSONObject("payload").optString("collapseId"));
+      assertEquals("collapseId1", firstGroupedNotification.optString("collapseId"));
    }
 
    @Test