Update InAppMessageClickEvent/Result

Change click listener param to `event` and event variable names from `action` to `result`

Author: jennantilla

Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/application/MainApplication.java

@@ -78,7 +78,7 @@ public void onDidDismiss(@NonNull IInAppMessageDidDismissEvent event) {
 
         OneSignal.getInAppMessages().addClickListener(new IInAppMessageClickListener() {
             @Override
-            public void onClick(@Nullable IInAppMessageClickEvent result) {
+            public void onClick(@Nullable IInAppMessageClickEvent event) {
                 Log.v(Tag.LOG_TAG, "INotificationClickListener.inAppMessageClicked");
             }
         });

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/inAppMessages/IInAppMessageClickListener.kt

@@ -4,7 +4,7 @@ interface IInAppMessageClickListener {
     /**
      * Fires when a user clicks on a clickable element in the IAM.
      *
-     * @param result The [IInAppMessageClickEvent] with the user's response and properties of this message.
+     * @param event The [IInAppMessageClickEvent] with the user's response and properties of this message.
      */
-    fun onClick(result: IInAppMessageClickEvent)
+    fun onClick(event: IInAppMessageClickEvent)
 }

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/inAppMessages/InAppMessageActionUrlType.kt

@@ -24,6 +24,10 @@ enum class InAppMessageActionUrlType(
     REPLACE_CONTENT("replacement"),
     ;
 
+    fun toString(): String {
+        return text
+    }
+
     companion object {
         fun fromString(text: String?): InAppMessageActionUrlType? {
             for (type in values()) {

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

@@ -10,14 +10,14 @@ internal class InAppMessageClickEvent(msg: InAppMessage, actn: InAppMessageClick
         get() = _message
 
     override val result: IInAppMessageClickResult
-        get() = _action
+        get() = _result
 
     private val _message: InAppMessage = msg
-    private val _action: InAppMessageClickResult = actn
+    private val _result: InAppMessageClickResult = actn
 
     fun toJSONObject(): JSONObject {
         return JSONObject()
             .put("message", _message.toJSONObject())
-            .put("action", _action.toJSONObject())
+            .put("action", _result.toJSONObject())
     }
 }

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

@@ -111,9 +111,8 @@ internal class InAppMessageClickResult(json: JSONObject, promptFactory: IInAppMe
             if (tags != null) {
                 mainObj.put(TAGS, tags!!.toJSONObject())
             }
-            // Omitted for now until necessary
-//            if (urlTarget != null)
-//                mainObj.put("url_target", urlTarget.toJSONObject());
+            if (urlTarget != null)
+                mainObj.put("url_target", urlTarget.toString());
         } catch (e: JSONException) {
             e.printStackTrace()
         }