Merge pull request #1767 from OneSignal/user-model/click_event_result

[User Model] Update click event result

Author: emawby

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

@@ -30,28 +30,13 @@ package com.onesignal.notifications
  * The action a user has taken when opening a notification.
  */
 interface INotificationClickResult {
-    /**
-     * The type of action the user took on this notification.
-     */
-    val type: ActionType
-
     /** When [type] is [ActionType.ActionButton], this will be the custom id of action taken.
      *  See [Action Buttons | OneSignal Docs](https://documentation.onesignal.com/docs/action-buttons).
      **/
     val actionId: String?
 
     /**
-     * The type of actions the user can take on a notification.
+     * The launch url for the notification.
      */
-    enum class ActionType {
-        /**
-         * The notification was clicked on.
-         */
-        Opened,
-
-        /**
-         * The user clicked on the call-to-action button within the notification.
-         */
-        ActionButton,
-    }
+    val url: String?
 }

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

@@ -31,12 +31,12 @@ import com.onesignal.notifications.INotificationClickResult
 import org.json.JSONObject
 
 internal class NotificationClickResult(
-    override val type: INotificationClickResult.ActionType,
     override val actionId: String?,
+    override val url: String?
 ) : INotificationClickResult {
     fun toJSONObject(): JSONObject {
         return JSONObject()
-            .put("type", type)
             .putSafe("actionId", actionId)
+            .putSafe("url", url)
     }
 }

OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/common/NotificationHelper.kt

@@ -234,16 +234,15 @@ object NotificationHelper {
             }
         }
 
-        val actionType =
-            if (actionSelected != null) INotificationClickResult.ActionType.ActionButton else INotificationClickResult.ActionType.Opened
-        val notificationAction = NotificationClickResult(actionType, actionSelected)
-
         val notification = com.onesignal.notifications.internal.Notification(
             groupedNotifications,
             payload!!,
             androidNotificationId,
             time,
         )
-        return NotificationClickEvent(notification, notificationAction)
+
+        val notificationResult = NotificationClickResult(actionSelected, notification.launchURL)
+
+        return NotificationClickEvent(notification, notificationResult)
     }
 }