address feedback

Author: cameronvoell

android/src/main/java/expo/modules/xmtpreactnativesdk/XMTPModule.kt

@@ -2172,11 +2172,11 @@ class XMTPModule : Module() {
             }
         }
 
-        AsyncFunction("sendSyncArchive") Coroutine { installationId: String, pin: String, serverUrl: String?, startNs: Int?, endNs: Int?, archiveElements: List<String>?, excludeDisappearingMessages: Boolean? ->
+        AsyncFunction("sendSyncArchive") Coroutine { installationId: String, pin: String, serverUrl: String?, startNs: Long?, endNs: Long?, archiveElements: List<String>?, excludeDisappearingMessages: Boolean? ->
             withContext(Dispatchers.IO) {
                 val client = clients[installationId] ?: throw XMTPException("No client")
                 val elements = archiveElements?.map { getArchiveElement(it) } ?: listOf(ArchiveElement.MESSAGES, ArchiveElement.CONSENT)
-                val opts = ArchiveOptions(startNs?.toLong(), endNs?.toLong(), elements, excludeDisappearingMessages ?: false)
+                val opts = ArchiveOptions(startNs, endNs, elements, excludeDisappearingMessages ?: false)
                 val url = serverUrl?.takeIf { it.isNotBlank() } ?: client.environment.getHistorySyncUrl()
                 client.sendSyncArchive(opts, url, pin)
             }

android/src/main/java/expo/modules/xmtpreactnativesdk/wrappers/ArchiveMetadataWrapper.kt

@@ -32,11 +32,11 @@ class ArchiveMetadataWrapper {
             }
         }
 
-        fun encode(metadata: ArchiveMetadata?): String {
-            val obj = if (metadata != null) {
+        /** Returns metadata as a map for embedding in another JSON object (avoids double JSON encoding). */
+        fun encodeToMap(metadata: ArchiveMetadata?): Map<String, Any?> {
+            return if (metadata != null) {
                 encodeToObj(metadata)
             } else {
-                // Create a default metadata object when null
                 mapOf(
                     "archiveVersion" to 0u,
                     "elements" to listOf("messages", "consent"),
@@ -45,7 +45,10 @@ class ArchiveMetadataWrapper {
                     "endNs" to null
                 )
             }
-            return gson.toJson(obj)
+        }
+
+        fun encode(metadata: ArchiveMetadata?): String {
+            return gson.toJson(encodeToMap(metadata))
         }
     }
 }

android/src/main/java/expo/modules/xmtpreactnativesdk/wrappers/AvailableArchiveWrapper.kt

@@ -8,9 +8,9 @@ class AvailableArchiveWrapper {
     companion object {
         private val gson = GsonBuilder().create()
 
-        fun encodeToObj(archive: AvailableArchive): Map<String, Any> = mapOf(
+        fun encodeToObj(archive: AvailableArchive): Map<String, Any?> = mapOf(
             "pin" to archive.pin,
-            "metadata" to ArchiveMetadataWrapper.encode(archive.metadata),
+            "metadata" to ArchiveMetadataWrapper.encodeToMap(archive.metadata),
             "sentByInstallation" to Base64.encodeToString(archive.sentByInstallation, Base64.NO_WRAP),
         )
 

ios/XMTPModule.swift

@@ -3013,7 +3013,8 @@ public class XMTPModule: Module {
 			let opts = XMTP.ArchiveOptions(
 				startNs: startNs,
 				endNs: endNs,
-				archiveElements: elements
+				archiveElements: elements,
+				excludeDisappearingMessages: excludeDisappearingMessages ?? false
 			)
 			try await client.sendSyncArchive(opts: opts, serverUrl: serverUrl, pin: pin)
 		}