fix up the json parsing

xmtp · Nov 30, 2023 · e77a713 · e77a713
1 parent 25541cc
commit e77a713
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/android/src/main/java/expo/modules/xmtpreactnativesdk/wrappers/ContentJson.kt b/android/src/main/java/expo/modules/xmtpreactnativesdk/wrappers/ContentJson.kt
@@ -35,7 +35,7 @@ import java.net.URL
 class ContentJson(
     val type: ContentTypeId,
     val content: Any?,
-    val encodedContent: EncodedContent? = null,
+    private val encodedContent: EncodedContent? = null,
 ) {
     constructor(encoded: EncodedContent) : this(
         type = encoded.type,
@@ -173,13 +173,19 @@ class ContentJson(
             )
 
             else -> {
-                val gson = GsonBuilder().create()
-                val encodedContentJSON = try {
-                    gson.toJson(encodedContent).toString()
-                } catch (e: Exception) {
-                    null
+                val json = JsonObject()
+                encodedContent?.let {
+                    val gson = GsonBuilder().create()
+                    val encodedType = gson.toJson(encodedContent.type)
+                    val parameters = gson.toJson(encodedContent.parametersMap)
+
+
+                    json.addProperty("fallback", encodedContent.fallback)
+                    json.add("parameters", JsonParser.parseString(parameters))
+                    json.add("type", JsonParser.parseString(encodedType))
                 }
-                if (!encodedContentJSON.isNullOrBlank()) {
+                val encodedContentJSON = json.toString()
+                if (encodedContentJSON.isNotBlank()) {
                     mapOf("encoded" to encodedContentJSON)
                 } else {
                     mapOf(
@@ -191,4 +197,4 @@ class ContentJson(
             }
         }
     }
-}
+}