Merge pull request #1723 from OneSignal/user-model/tojsonobject

[User Model] Provide serialization mechanism for external classes

Author: brismithers

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

@@ -126,6 +126,12 @@ interface INotification {
      */
     val ttl: Int
 
+    /**
+     * When this notification is a summary notification, this will contain the list of
+     * notifications it summarizes.
+     */
+    val groupedNotifications: List<INotification>?
+
     /**
      * Create a mutable copy of this notification. Typically used in [IRemoteNotificationReceivedHandler]
      * or [INotificationWillShowInForegroundHandler] to modify an incoming notification prior to it

OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/InAppMessageClickResult.kt

@@ -3,9 +3,21 @@ package com.onesignal.inAppMessages.internal
 import com.onesignal.inAppMessages.IInAppMessage
 import com.onesignal.inAppMessages.IInAppMessageAction
 import com.onesignal.inAppMessages.IInAppMessageClickResult
+import org.json.JSONObject
 
-class InAppMessageClickResult(
-    override val message: IInAppMessage,
+internal class InAppMessageClickResult(msg: InAppMessage, actn: InAppMessageAction) : IInAppMessageClickResult {
+    override val message: IInAppMessage
+        get() = _message
 
     override val action: IInAppMessageAction
-) : IInAppMessageClickResult
+        get() = _action
+
+    private val _message: InAppMessage = msg
+    private val _action: InAppMessageAction = actn
+
+    fun toJSONObject(): JSONObject {
+        return JSONObject()
+            .put("message", _message.toJSONObject())
+            .put("action", _action.toJSONObject())
+    }
+}

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

@@ -25,12 +25,7 @@ import org.json.JSONObject
 open class Notification : INotification {
     var notificationExtender: NotificationCompat.Extender? = null
 
-    /**
-     * Summary notifications grouped
-     * Notification payload will have the most recent notification received.
-     */
-    var groupedNotifications: List<Notification>? = null
-
+    override var groupedNotifications: List<Notification>? = null
     override var androidNotificationId = 0
     override var notificationId: String? = null
     override var templateName: String? = null

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

@@ -26,9 +26,17 @@
  */
 package com.onesignal.notifications.internal
 
+import com.onesignal.common.putSafe
 import com.onesignal.notifications.INotificationAction
+import org.json.JSONObject
 
 internal class NotificationAction(
     override val type: INotificationAction.ActionType,
     override val actionId: String?
-) : INotificationAction
+) : INotificationAction {
+    fun toJSONObject(): JSONObject {
+        return JSONObject()
+            .put("type", type)
+            .putSafe("actionId", actionId)
+    }
+}

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

@@ -4,15 +4,30 @@ import com.onesignal.notifications.INotification
 import com.onesignal.notifications.INotificationAction
 import com.onesignal.notifications.INotificationClickHandler
 import com.onesignal.notifications.INotificationClickResult
+import org.json.JSONObject
 
 /**
  * The data provided to [INotificationClickHandler.notificationClicked] when a notification
  * has been opened by the user.
  */
-class NotificationClickResult(
+internal class NotificationClickResult(
+    notif: Notification,
+    actn: NotificationAction
+) : INotificationClickResult {
     /** The notification that was opened by the user. **/
-    override val notification: INotification,
+    override val notification: INotification
+        get() = _notification
 
     /** The action the user took to open the notification. **/
     override val action: INotificationAction
-) : INotificationClickResult
+        get() = _action
+
+    private val _notification: Notification = notif
+    private val _action: NotificationAction = actn
+
+    fun toJSONObject(): JSONObject {
+        return JSONObject()
+            .put("notification", _notification.toJSONObject())
+            .put("action", _action.toJSONObject())
+    }
+}

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

@@ -203,7 +203,7 @@ object NotificationHelper {
         return ""
     }
 
-    fun generateNotificationOpenedResult(jsonArray: JSONArray, time: ITime): NotificationClickResult {
+    internal fun generateNotificationOpenedResult(jsonArray: JSONArray, time: ITime): NotificationClickResult {
         val jsonArraySize = jsonArray.length()
         var firstMessage = true
         val androidNotificationId = jsonArray.optJSONObject(0)