[ECO-5196] Updated Metadata.kt, refactored Metadata type to JsonObject

- Updated usages across roomreactions, messages and chatAPI to use JsonObject
ably · Feb 4, 2025 · 8cf8d51 · 8cf8d51
1 parent 71b20c4
commit 8cf8d51
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/chat-android/src/main/java/com/ably/chat/ChatApi.kt b/chat-android/src/main/java/com/ably/chat/ChatApi.kt
@@ -45,7 +45,7 @@ internal class ChatApi(
                     roomId = it.requireString("roomId"),
                     text = it.requireString("text"),
                     createdAt = it.requireLong("createdAt"),
-                    metadata = it.asJsonObject.get("metadata"),
+                    metadata = it.asJsonObject.getAsJsonObject("metadata"),
                     headers = it.asJsonObject.get("headers")?.toMap() ?: mapOf(),
                     action = action,
                 )

diff --git a/chat-android/src/main/java/com/ably/chat/Messages.kt b/chat-android/src/main/java/com/ably/chat/Messages.kt
@@ -340,6 +340,6 @@ private fun parsePubSubMessageData(data: Any): PubSubMessageData {
     }
     return PubSubMessageData(
         text = data.requireString("text"),
-        metadata = data.get("metadata"),
+        metadata = data.getAsJsonObject("metadata"),
     )
 }
diff --git a/chat-android/src/main/java/com/ably/chat/Metadata.kt b/chat-android/src/main/java/com/ably/chat/Metadata.kt
@@ -1,6 +1,6 @@
 package com.ably.chat
 
-import com.google.gson.JsonElement
+import com.google.gson.JsonObject
 
 /**
  * Metadata is a map of extra information that can be attached to chat
@@ -15,4 +15,4 @@ import com.google.gson.JsonElement
  * The key `ably-chat` is reserved and cannot be used. Ably may populate
  * this with different values in the future.
  */
-typealias Metadata = JsonElement
+typealias Metadata = JsonObject
diff --git a/chat-android/src/main/java/com/ably/chat/RoomReactions.kt b/chat-android/src/main/java/com/ably/chat/RoomReactions.kt
@@ -153,7 +153,7 @@ internal class DefaultRoomReactions(
                 type = data.requireString("type"),
                 createdAt = pubSubMessage.timestamp,
                 clientId = pubSubMessage.clientId,
-                metadata = data.get("metadata"),
+                metadata = data.getAsJsonObject("metadata"),
                 headers = pubSubMessage.extras?.asJsonObject()?.get("headers")?.toMap() ?: mapOf(),
                 isSelf = pubSubMessage.clientId == room.clientId,
             )