update the bindings

xmtp · Nov 15, 2024 · 3ac07b0 · 3ac07b0
1 parent c54698e
commit 3ac07b0
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 24 deletions.
diff --git a/library/src/main/java/org/xmtp/android/library/Client.kt b/library/src/main/java/org/xmtp/android/library/Client.kt
@@ -7,6 +7,7 @@ import org.xmtp.android.library.codecs.TextCodec
 import org.xmtp.android.library.libxmtp.Message
 import org.xmtp.android.library.libxmtp.XMTPLogger
 import org.xmtp.android.library.messages.rawData
+import uniffi.xmtpv3.FfiConversationType
 import uniffi.xmtpv3.FfiDeviceSyncKind
 import uniffi.xmtpv3.FfiXmtpClient
 import uniffi.xmtpv3.createClient
@@ -218,12 +219,10 @@ class Client() {
     fun findConversation(conversationId: String): Conversation? {
         return try {
             val conversation = ffiClient.conversation(conversationId.hexToByteArray())
-            if (conversation.groupMetadata().conversationType() == "dm") {
-                Conversation.Dm(Dm(this, conversation))
-            } else if (conversation.groupMetadata().conversationType() == "group") {
-                Conversation.Group(Group(this, conversation))
-            } else {
-                null
+            when (conversation.conversationType()) {
+                FfiConversationType.GROUP -> Conversation.Group(Group(this, conversation))
+                FfiConversationType.DM -> Conversation.Dm(Dm(this, conversation))
+                else -> null
             }
         } catch (e: Exception) {
             null
@@ -236,12 +235,10 @@ class Client() {
         val conversationId = matchResult?.groupValues?.get(1) ?: ""
         return try {
             val conversation = ffiClient.conversation(conversationId.hexToByteArray())
-            if (conversation.groupMetadata().conversationType() == "dm") {
-                Conversation.Dm(Dm(this, conversation))
-            } else if (conversation.groupMetadata().conversationType() == "group") {
-                Conversation.Group(Group(this, conversation))
-            } else {
-                null
+            when (conversation.conversationType()) {
+                FfiConversationType.GROUP -> Conversation.Group(Group(this, conversation))
+                FfiConversationType.DM -> Conversation.Dm(Dm(this, conversation))
+                else -> null
             }
         } catch (e: Exception) {
             null

diff --git a/library/src/main/java/org/xmtp/android/library/Conversations.kt b/library/src/main/java/org/xmtp/android/library/Conversations.kt
@@ -7,6 +7,7 @@ import kotlinx.coroutines.flow.callbackFlow
 import org.xmtp.android.library.libxmtp.Message
 import uniffi.xmtpv3.FfiConversation
 import uniffi.xmtpv3.FfiConversationCallback
+import uniffi.xmtpv3.FfiConversationType
 import uniffi.xmtpv3.FfiConversations
 import uniffi.xmtpv3.FfiCreateGroupOptions
 import uniffi.xmtpv3.FfiDirection
@@ -41,10 +42,9 @@ data class Conversations(
 
     suspend fun fromWelcome(envelopeBytes: ByteArray): Conversation {
         val conversation = ffiConversations.processStreamedWelcomeMessage(envelopeBytes)
-        return if (conversation.groupMetadata().conversationType() == "dm") {
-            Conversation.Dm(Dm(client, conversation))
-        } else {
-            Conversation.Group(Group(client, conversation))
+        return when (conversation.conversationType()) {
+            FfiConversationType.DM -> Conversation.Dm(Dm(client, conversation))
+            else -> Conversation.Group(Group(client, conversation))
         }
     }
 
@@ -250,21 +250,19 @@ data class Conversations(
     }
 
     private fun FfiConversation.toConversation(): Conversation {
-        return if (groupMetadata().conversationType() == "dm") {
-            Conversation.Dm(Dm(client, this))
-        } else {
-            Conversation.Group(Group(client, this))
+        return when (conversationType()) {
+            FfiConversationType.DM -> Conversation.Dm(Dm(client, this))
+            else -> Conversation.Group(Group(client, this))
         }
     }
 
     fun stream(type: ConversationType = ConversationType.ALL): Flow<Conversation> =
         callbackFlow {
             val conversationCallback = object : FfiConversationCallback {
                 override fun onConversation(conversation: FfiConversation) {
-                    if (conversation.groupMetadata().conversationType() == "dm") {
-                        trySend(Conversation.Dm(Dm(client, conversation)))
-                    } else {
-                        trySend(Conversation.Group(Group(client, conversation)))
+                    when (conversation.conversationType()) {
+                        FfiConversationType.DM -> trySend(Conversation.Dm(Dm(client, conversation)))
+                        else -> trySend(Conversation.Group(Group(client, conversation)))
                     }
                 }
 

diff --git a/library/src/main/jniLibs/arm64-v8a/libuniffi_xmtpv3.so b/library/src/main/jniLibs/arm64-v8a/libuniffi_xmtpv3.so
diff --git a/library/src/main/jniLibs/armeabi-v7a/libuniffi_xmtpv3.so b/library/src/main/jniLibs/armeabi-v7a/libuniffi_xmtpv3.so
diff --git a/library/src/main/jniLibs/x86/libuniffi_xmtpv3.so b/library/src/main/jniLibs/x86/libuniffi_xmtpv3.so
diff --git a/library/src/main/jniLibs/x86_64/libuniffi_xmtpv3.so b/library/src/main/jniLibs/x86_64/libuniffi_xmtpv3.so