adds content type filter libxmtp update

library/src/main/java/libxmtp-version.txt

@@ -1,3 +1,3 @@
-Version: 7d863bde
+Version: a9111a13
 Branch: main
-Date: 2024-12-20 22:46:38 +0000
+Date: 2024-12-21 00:25:32 +0000

library/src/main/java/org/xmtp/android/library/Conversations.kt

@@ -242,7 +242,8 @@ data class Conversations(
                                 null,
                                 1,
                                 null,
-                                FfiDirection.DESCENDING
+                                FfiDirection.DESCENDING,
+                                null
                             )
                         )
                             .firstOrNull()

library/src/main/java/org/xmtp/android/library/Dm.kt

@@ -12,6 +12,7 @@ import org.xmtp.android.library.libxmtp.Message
 import org.xmtp.android.library.libxmtp.Message.MessageDeliveryStatus
 import org.xmtp.android.library.libxmtp.Message.SortDirection
 import org.xmtp.android.library.messages.Topic
+import uniffi.xmtpv3.FfiContentType
 import uniffi.xmtpv3.FfiConversation
 import uniffi.xmtpv3.FfiConversationMetadata
 import uniffi.xmtpv3.FfiDeliveryStatus
@@ -109,6 +110,7 @@ class Dm(val client: Client, private val libXMTPGroup: FfiConversation) {
         afterNs: Long? = null,
         direction: SortDirection = SortDirection.DESCENDING,
         deliveryStatus: MessageDeliveryStatus = MessageDeliveryStatus.ALL,
+        contentTypes: List<FfiContentType>? = null
     ): List<DecodedMessage> {
         return libXMTPGroup.findMessages(
             opts = FfiListMessagesOptions(
@@ -124,7 +126,8 @@ class Dm(val client: Client, private val libXMTPGroup: FfiConversation) {
                 direction = when (direction) {
                     SortDirection.ASCENDING -> FfiDirection.ASCENDING
                     else -> FfiDirection.DESCENDING
-                }
+                },
+                contentTypes = contentTypes
             )
         ).mapNotNull {
             Message(client, it).decodeOrNull()

library/src/main/java/org/xmtp/android/library/Group.kt

@@ -12,6 +12,7 @@ import org.xmtp.android.library.libxmtp.Message
 import org.xmtp.android.library.libxmtp.Message.MessageDeliveryStatus
 import org.xmtp.android.library.libxmtp.Message.SortDirection
 import org.xmtp.android.library.messages.Topic
+import uniffi.xmtpv3.FfiContentType
 import uniffi.xmtpv3.FfiConversation
 import uniffi.xmtpv3.FfiConversationMetadata
 import uniffi.xmtpv3.FfiDeliveryStatus
@@ -126,6 +127,7 @@ class Group(val client: Client, private val libXMTPGroup: FfiConversation) {
         afterNs: Long? = null,
         direction: SortDirection = SortDirection.DESCENDING,
         deliveryStatus: MessageDeliveryStatus = MessageDeliveryStatus.ALL,
+        contentTypes: List<FfiContentType>? = null
     ): List<DecodedMessage> {
         return libXMTPGroup.findMessages(
             opts = FfiListMessagesOptions(
@@ -141,7 +143,8 @@ class Group(val client: Client, private val libXMTPGroup: FfiConversation) {
                 direction = when (direction) {
                     SortDirection.ASCENDING -> FfiDirection.ASCENDING
                     else -> FfiDirection.DESCENDING
-                }
+                },
+                contentTypes = contentTypes
             )
         ).mapNotNull {
             Message(client, it).decodeOrNull()

library/src/main/java/xmtpv3.kt

@@ -10430,6 +10430,7 @@ data class FfiListMessagesOptions(
     var `limit`: kotlin.Long?,
     var `deliveryStatus`: FfiDeliveryStatus?,
     var `direction`: FfiDirection?,
+    var `contentTypes`: List<FfiContentType>?,
 ) {
 
     companion object
@@ -10447,6 +10448,7 @@ public object FfiConverterTypeFfiListMessagesOptions :
             FfiConverterOptionalLong.read(buf),
             FfiConverterOptionalTypeFfiDeliveryStatus.read(buf),
             FfiConverterOptionalTypeFfiDirection.read(buf),
+            FfiConverterOptionalSequenceTypeFfiContentType.read(buf),
         )
     }
 
@@ -10455,7 +10457,8 @@ public object FfiConverterTypeFfiListMessagesOptions :
                     FfiConverterOptionalLong.allocationSize(value.`sentAfterNs`) +
                     FfiConverterOptionalLong.allocationSize(value.`limit`) +
                     FfiConverterOptionalTypeFfiDeliveryStatus.allocationSize(value.`deliveryStatus`) +
-                    FfiConverterOptionalTypeFfiDirection.allocationSize(value.`direction`)
+                    FfiConverterOptionalTypeFfiDirection.allocationSize(value.`direction`) +
+                    FfiConverterOptionalSequenceTypeFfiContentType.allocationSize(value.`contentTypes`)
             )
 
     override fun write(value: FfiListMessagesOptions, buf: ByteBuffer) {
@@ -10464,6 +10467,7 @@ public object FfiConverterTypeFfiListMessagesOptions :
         FfiConverterOptionalLong.write(value.`limit`, buf)
         FfiConverterOptionalTypeFfiDeliveryStatus.write(value.`deliveryStatus`, buf)
         FfiConverterOptionalTypeFfiDirection.write(value.`direction`, buf)
+        FfiConverterOptionalSequenceTypeFfiContentType.write(value.`contentTypes`, buf)
     }
 }
 
@@ -10847,6 +10851,41 @@ public object FfiConverterTypeFfiConsentState : FfiConverterRustBuffer<FfiConsen
 }
 
 
+enum class FfiContentType {
+
+    UNKNOWN,
+    TEXT,
+    GROUP_MEMBERSHIP_CHANGE,
+    GROUP_UPDATED,
+    REACTION,
+    READ_RECEIPT,
+    REPLY,
+    ATTACHMENT,
+    REMOTE_ATTACHMENT,
+    TRANSACTION_REFERENCE;
+
+    companion object
+}
+
+
+/**
+ * @suppress
+ */
+public object FfiConverterTypeFfiContentType : FfiConverterRustBuffer<FfiContentType> {
+    override fun read(buf: ByteBuffer) = try {
+        FfiContentType.values()[buf.getInt() - 1]
+    } catch (e: IndexOutOfBoundsException) {
+        throw RuntimeException("invalid enum value, something is very wrong!!", e)
+    }
+
+    override fun allocationSize(value: FfiContentType) = 4UL
+
+    override fun write(value: FfiContentType, buf: ByteBuffer) {
+        buf.putInt(value.ordinal + 1)
+    }
+}
+
+
 enum class FfiConversationMessageKind {
 
     APPLICATION,
@@ -11965,6 +12004,37 @@ public object FfiConverterOptionalTypeFfiMetadataField : FfiConverterRustBuffer<
 }
 
 
+/**
+ * @suppress
+ */
+public object FfiConverterOptionalSequenceTypeFfiContentType :
+    FfiConverterRustBuffer<List<FfiContentType>?> {
+    override fun read(buf: ByteBuffer): List<FfiContentType>? {
+        if (buf.get().toInt() == 0) {
+            return null
+        }
+        return FfiConverterSequenceTypeFfiContentType.read(buf)
+    }
+
+    override fun allocationSize(value: List<FfiContentType>?): ULong {
+        if (value == null) {
+            return 1UL
+        } else {
+            return 1UL + FfiConverterSequenceTypeFfiContentType.allocationSize(value)
+        }
+    }
+
+    override fun write(value: List<FfiContentType>?, buf: ByteBuffer) {
+        if (value == null) {
+            buf.put(0)
+        } else {
+            buf.put(1)
+            FfiConverterSequenceTypeFfiContentType.write(value, buf)
+        }
+    }
+}
+
+
 /**
  * @suppress
  */
@@ -12311,6 +12381,33 @@ public object FfiConverterSequenceTypeFfiV2QueryResponse :
 }
 
 
+/**
+ * @suppress
+ */
+public object FfiConverterSequenceTypeFfiContentType :
+    FfiConverterRustBuffer<List<FfiContentType>> {
+    override fun read(buf: ByteBuffer): List<FfiContentType> {
+        val len = buf.getInt()
+        return List<FfiContentType>(len) {
+            FfiConverterTypeFfiContentType.read(buf)
+        }
+    }
+
+    override fun allocationSize(value: List<FfiContentType>): ULong {
+        val sizeForLength = 4UL
+        val sizeForItems = value.map { FfiConverterTypeFfiContentType.allocationSize(it) }.sum()
+        return sizeForLength + sizeForItems
+    }
+
+    override fun write(value: List<FfiContentType>, buf: ByteBuffer) {
+        buf.putInt(value.size)
+        value.iterator().forEach {
+            FfiConverterTypeFfiContentType.write(it, buf)
+        }
+    }
+}
+
+
 /**
  * @suppress
  */
@@ -12369,7 +12466,7 @@ public object FfiConverterMapStringBoolean :
         // The parens on `(k, v)` here ensure we're calling the right method,
         // which is important for compatibility with older android devices.
         // Ref https://blog.danlew.net/2017/03/16/kotlin-puzzler-whose-line-is-it-anyways/
-        value.iterator().forEach { (k, v) ->
+        value.forEach { (k, v) ->
             FfiConverterString.write(k, buf)
             FfiConverterBoolean.write(v, buf)
         }