add more tests and group streaming

Author: nplasterer

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

@@ -59,6 +59,24 @@ class GroupTest {
 
     @Test
     fun testCanListGroupMembers() {
+        val group = boClient.conversations.newGroup(
+            listOf(
+                alix.walletAddress.lowercase(),
+                caro.walletAddress.lowercase()
+            )
+        )
+        assertEquals(
+            group.memberAddresses().sorted(),
+            listOf(
+                caro.walletAddress.lowercase(),
+                alix.walletAddress.lowercase(),
+                bo.walletAddress.lowercase()
+            ).sorted()
+        )
+    }
+
+    @Test
+    fun testCanAddGroupMembers() {
         val group = boClient.conversations.newGroup(listOf(alix.walletAddress.lowercase()))
         group.addMembers(listOf(caro.walletAddress.lowercase()))
         assertEquals(
@@ -71,6 +89,24 @@ class GroupTest {
         )
     }
 
+    @Test
+    fun testCanRemoveGroupMembers() {
+        val group = boClient.conversations.newGroup(
+            listOf(
+                alix.walletAddress.lowercase(),
+                caro.walletAddress.lowercase()
+            )
+        )
+        group.removeMembers(listOf(caro.walletAddress.lowercase()))
+        assertEquals(
+            group.memberAddresses().sorted(),
+            listOf(
+                alix.walletAddress.lowercase(),
+                bo.walletAddress.lowercase()
+            ).sorted()
+        )
+    }
+
     @Test
     fun testCanListGroups() {
         boClient.conversations.newGroup(listOf(alix.walletAddress.lowercase()))
@@ -83,7 +119,7 @@ class GroupTest {
     fun testCanListGroupsAndConversations() {
         boClient.conversations.newGroup(listOf(alix.walletAddress.lowercase()))
         boClient.conversations.newGroup(listOf(caro.walletAddress.lowercase()))
-        boClient.conversations.newConversation(alix.walletAddress)
+        boClient.conversations.newConversation(alix.walletAddress.lowercase())
         val convos = boClient.conversations.list(includeGroups = true)
         assertEquals(convos.size, 3)
     }
@@ -100,4 +136,27 @@ class GroupTest {
         assertEquals(sameGroup.messages().size, 2)
         assertEquals(sameGroup.messages().first().body, "gm")
     }
+
+    @Test
+    fun testCanSendContentTypesToGroup() {
+        val group = boClient.conversations.newGroup(listOf(alix.walletAddress.lowercase()))
+
+    }
+
+    @Test
+    fun testCanStreamGroupMessages() {
+        val group = boClient.conversations.newGroup(listOf(alix.walletAddress.lowercase()))
+    }
+
+    @Test
+    fun testCanStreamGroups() {
+        val group = boClient.conversations.newGroup(listOf(alix.walletAddress.lowercase()))
+
+    }
+
+    @Test
+    fun testCanStreamGroupsAndConversations() {
+        val group = boClient.conversations.newGroup(listOf(alix.walletAddress.lowercase()))
+
+    }
 }

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

@@ -3,12 +3,16 @@ package org.xmtp.android.library
 import android.util.Log
 import io.grpc.StatusException
 import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import org.xmtp.android.library.GRPCApiClient.Companion.makeQueryRequest
 import org.xmtp.android.library.GRPCApiClient.Companion.makeSubscribeRequest
+import org.xmtp.android.library.libxmtp.Message
+import org.xmtp.android.library.libxmtp.MessageEmitter
 import org.xmtp.android.library.messages.Envelope
 import org.xmtp.android.library.messages.EnvelopeBuilder
 import org.xmtp.android.library.messages.InvitationV1
@@ -34,6 +38,7 @@ import org.xmtp.proto.message.contents.Invitation
 import org.xmtp.android.library.messages.DecryptedMessage
 import uniffi.xmtpv3.FfiConversations
 import uniffi.xmtpv3.FfiListConversationsOptions
+import uniffi.xmtpv3.org.xmtp.android.library.libxmtp.GroupEmitter
 import java.util.Date
 
 data class Conversations(
@@ -450,7 +455,21 @@ data class Conversations(
      * of the information of those conversations according to the topics
      * @return Stream of data information for the conversations
      */
-    fun stream(): Flow<Conversation> = flow {
+    fun stream(includeGroups: Boolean = false): Flow<Conversation> = flow {
+        if (includeGroups) {
+            val groupEmitter = GroupEmitter()
+
+            coroutineScope {
+                launch {
+                    groupEmitter.groups.collect { group ->
+                        emit(Conversation.Group(Group(client, group)))
+                    }
+                }
+            }
+
+            libXMTPConversations?.stream(groupEmitter.callback)
+        }
+
         val streamedConversationTopics: MutableSet<String> = mutableSetOf()
         client.subscribeTopic(
             listOf(Topic.userIntro(client.address), Topic.userInvite(client.address)),
@@ -474,6 +493,20 @@ data class Conversations(
         }
     }
 
+    fun streamGroups(): Flow<Group> = flow {
+        val groupEmitter = GroupEmitter()
+
+        coroutineScope {
+            launch {
+                groupEmitter.groups.collect { group ->
+                    emit(Group(client, group))
+                }
+            }
+        }
+
+        libXMTPConversations?.stream(groupEmitter.callback)
+    }
+
     /**
      * Get the stream of all messages of the current [Client]
      * @return Flow object of [DecodedMessage] that represents all the messages of the

library/src/main/java/org/xmtp/android/library/libxmtp/GroupEmitter.kt

@@ -0,0 +1,17 @@
+package uniffi.xmtpv3.org.xmtp.android.library.libxmtp
+
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import uniffi.xmtpv3.FfiConversationCallback
+import uniffi.xmtpv3.FfiGroup
+
+class GroupEmitter {
+    private val _groups = MutableSharedFlow<FfiGroup>()
+    val groups = _groups.asSharedFlow()
+
+    val callback: FfiConversationCallback = object : FfiConversationCallback {
+        override fun onConversation(conversation: FfiGroup) {
+            _groups.tryEmit(conversation)
+        }
+    }
+}