return number of active groups synced from sync all groups function. …

…possible fork fixes (#291)

Co-authored-by: cameronvoell <[email protected]>

library/src/androidTest/java/org/xmtp/android/library/GroupTest.kt

@@ -912,29 +912,39 @@ class GroupTest {
         runBlocking { alixClient.conversations.syncGroups() }
         val alixGroup: Group = alixClient.findGroup(boGroup.id)!!
         val alixGroup2: Group = alixClient.findGroup(boGroup2.id)!!
+        var numGroups: UInt?
 
         assertEquals(alixGroup.messages().size, 0)
         assertEquals(alixGroup2.messages().size, 0)
 
         runBlocking {
             boGroup.send("hi")
             boGroup2.send("hi")
-            alixClient.conversations.syncAllGroups()
+            numGroups = alixClient.conversations.syncAllGroups()
         }
 
         assertEquals(alixGroup.messages().size, 1)
         assertEquals(alixGroup2.messages().size, 1)
+        assertEquals(numGroups, 2u)
 
         runBlocking {
             boGroup2.removeMembers(listOf(alix.walletAddress))
             boGroup.send("hi")
             boGroup.send("hi")
             boGroup2.send("hi")
             boGroup2.send("hi")
-            alixClient.conversations.syncAllGroups()
+            numGroups = alixClient.conversations.syncAllGroups()
         }
 
         assertEquals(alixGroup.messages().size, 3)
         assertEquals(alixGroup2.messages().size, 2)
+        // First syncAllGroups after remove includes the group you're removed from
+        assertEquals(numGroups, 2u)
+
+        runBlocking {
+            numGroups = alixClient.conversations.syncAllGroups()
+        }
+        // Next syncAllGroups will not include the inactive group
+        assertEquals(numGroups, 1u)
     }
 }

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

@@ -1,3 +1,3 @@
-Version: abe93739
-Branch: main
-Date: 2024-08-21 21:35:33 +0000
+Version: 023fef7e
+Branch: HEAD
+Date: 2024-08-26 15:07:03 +0000

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

@@ -193,8 +193,8 @@ data class Conversations(
     }
 
     // Sync all existing local groups data from the network (Note: call syncGroups() first to get the latest list of groups)
-    suspend fun syncAllGroups() {
-        libXMTPConversations?.syncAllGroups()
+    suspend fun syncAllGroups(): UInt? {
+        return libXMTPConversations?.syncAllGroups()
     }
 
     suspend fun listGroups(

library/src/main/java/xmtpv3.kt

@@ -49,8 +49,10 @@ open class RustBuffer : Structure() {
     // When dealing with these fields, make sure to call `toULong()`.
     @JvmField
     var capacity: Long = 0
+
     @JvmField
     var len: Long = 0
+
     @JvmField
     var data: Pointer? = null
 
@@ -135,6 +137,7 @@ class RustBufferByReference : ByReference(16) {
 open class ForeignBytes : Structure() {
     @JvmField
     var len: Int = 0
+
     @JvmField
     var data: Pointer? = null
 
@@ -223,6 +226,7 @@ internal const val UNIFFI_CALL_UNEXPECTED_ERROR = 2.toByte()
 internal open class UniffiRustCallStatus : Structure() {
     @JvmField
     var code: Byte = 0
+
     @JvmField
     var error_buf: RustBuffer.ByValue = RustBuffer.ByValue()
 
@@ -1987,7 +1991,7 @@ private fun uniffiCheckApiChecksums(lib: UniffiLib) {
     if (lib.uniffi_xmtpv3_checksum_method_fficonversations_sync() != 9054.toShort()) {
         throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
     }
-    if (lib.uniffi_xmtpv3_checksum_method_fficonversations_sync_all_groups() != 62850.toShort()) {
+    if (lib.uniffi_xmtpv3_checksum_method_fficonversations_sync_all_groups() != 3433.toShort()) {
         throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
     }
     if (lib.uniffi_xmtpv3_checksum_method_ffigroup_add_admin() != 4600.toShort()) {
@@ -2656,7 +2660,7 @@ public interface FfiConversationsInterface {
 
     suspend fun `sync`()
 
-    suspend fun `syncAllGroups`()
+    suspend fun `syncAllGroups`(): kotlin.UInt
 
     companion object
 }
@@ -2940,7 +2944,7 @@ open class FfiConversations : Disposable, AutoCloseable, FfiConversationsInterfa
 
     @Throws(GenericException::class)
     @Suppress("ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE")
-    override suspend fun `syncAllGroups`() {
+    override suspend fun `syncAllGroups`(): kotlin.UInt {
         return uniffiRustCallAsync(
             callWithPointer { thisPtr ->
                 UniffiLib.INSTANCE.uniffi_xmtpv3_fn_method_fficonversations_sync_all_groups(
@@ -2949,22 +2953,21 @@ open class FfiConversations : Disposable, AutoCloseable, FfiConversationsInterfa
                     )
             },
             { future, callback, continuation ->
-                UniffiLib.INSTANCE.ffi_xmtpv3_rust_future_poll_void(
+                UniffiLib.INSTANCE.ffi_xmtpv3_rust_future_poll_u32(
                     future,
                     callback,
                     continuation
                 )
             },
             { future, continuation ->
-                UniffiLib.INSTANCE.ffi_xmtpv3_rust_future_complete_void(
+                UniffiLib.INSTANCE.ffi_xmtpv3_rust_future_complete_u32(
                     future,
                     continuation
                 )
             },
-            { future -> UniffiLib.INSTANCE.ffi_xmtpv3_rust_future_free_void(future) },
+            { future -> UniffiLib.INSTANCE.ffi_xmtpv3_rust_future_free_u32(future) },
             // lift function
-            { Unit },
-
+            { FfiConverterUInt.lift(it) },
             // Error FFI converter
             GenericException.ErrorHandler,
         )