Add the notification discard parameter to the NotificationReceivedEvent

This is identical to the NotificationWillDisplay event parameter and logic in the generationProcessor

Author: emawby

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/notifications/INotificationReceivedEvent.kt

@@ -50,4 +50,11 @@ interface INotificationReceivedEvent {
      * can still be manually displayed using `notification.display()`.
      */
     fun preventDefault()
+
+    /**
+     * Call this to prevent OneSignal from displaying the notification automatically.
+     * @param discard an [preventDefault] set to true to dismiss the notification with no
+     * possibility of displaying it in the future.
+     */
+    fun preventDefault(discard: Boolean)
 }

OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/NotificationReceivedEvent.kt

@@ -9,9 +9,15 @@ internal class NotificationReceivedEvent(
     override val notification: Notification,
 ) : INotificationReceivedEvent {
     var isPreventDefault: Boolean = false
+    var discard: Boolean = false
 
     override fun preventDefault() {
+        preventDefault(false)
+    }
+
+    override fun preventDefault(discard: Boolean) {
         Logging.debug("NotificationReceivedEvent.preventDefault()")
         isPreventDefault = true
+        this.discard = discard
     }
 }

OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/generation/impl/NotificationGenerationProcessor.kt

@@ -73,7 +73,9 @@ internal class NotificationGenerationProcessor(
                 GlobalScope.launch(Dispatchers.IO) {
                     _lifecycleService.externalRemoteNotificationReceived(notificationReceivedEvent)
 
-                    if (notificationReceivedEvent.isPreventDefault) {
+                    if (notificationReceivedEvent.discard) {
+                        wantsToDisplay = false
+                    } else if (notificationReceivedEvent.isPreventDefault) {
                         // wait on display waiter. If the caller calls `display` on the notification,
                         // we will exit `waitForWake` and set `wantsToDisplay` to true. If the callback
                         // never calls `display` we will timeout and never set `wantsToDisplay` to true.
@@ -106,7 +108,7 @@ internal class NotificationGenerationProcessor(
                             _lifecycleService.externalNotificationWillShowInForeground(notificationWillDisplayEvent)
 
                             if (notificationWillDisplayEvent.discard) {
-                                wantsToDisplay = false;
+                                wantsToDisplay = false
                             } else if (notificationWillDisplayEvent.isPreventDefault) {
                                 // wait on display waiter. If the caller calls `display` on the notification,
                                 // we will exit `waitForWake` and set `wantsToDisplay` to true. If the callback