remove deprecated group chat implementation (#109)

xmtp · Aug 22, 2023 · bc76b60 · bc76b60
1 parent 86cf46d
commit bc76b60
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 178 deletions.
diff --git a/library/src/androidTest/java/org/xmtp/android/library/GroupChatTest.kt b/library/src/androidTest/java/org/xmtp/android/library/GroupChatTest.kt
diff --git a/library/src/main/java/org/xmtp/android/library/Client.kt b/library/src/main/java/org/xmtp/android/library/Client.kt
@@ -34,7 +34,6 @@ import org.xmtp.android.library.messages.walletAddress
 import org.xmtp.proto.message.api.v1.MessageApiOuterClass
 import org.xmtp.proto.message.api.v1.MessageApiOuterClass.BatchQueryResponse
 import org.xmtp.proto.message.api.v1.MessageApiOuterClass.QueryRequest
-import uniffi.xmtp_dh.org.xmtp.android.library.GroupChat
 import java.nio.charset.StandardCharsets
 import java.text.SimpleDateFormat
 import java.time.Instant
@@ -59,8 +58,6 @@ class Client() {
     lateinit var apiClient: ApiClient
     lateinit var contacts: Contacts
     lateinit var conversations: Conversations
-    var isGroupChatEnabled: Boolean = false
-        private set
 
     companion object {
         private const val TAG = "Client"
@@ -355,9 +352,4 @@ class Client() {
 
     val keys: PrivateKeyBundleV2
         get() = privateKeyBundleV1.toV2()
-
-    fun enableGroupChat() {
-        this.isGroupChatEnabled = true
-        GroupChat.registerCodecs()
-    }
 }
diff --git a/library/src/main/java/org/xmtp/android/library/Conversation.kt b/library/src/main/java/org/xmtp/android/library/Conversation.kt
@@ -19,14 +19,6 @@ sealed class Conversation {
         V2
     }
 
-    val isGroup: Boolean
-        get() {
-            return when (this) {
-                is V1 -> false
-                is V2 -> conversationV2.isGroup
-            }
-        }
-
     val version: Version
         get() {
             return when (this) {

diff --git a/library/src/main/java/org/xmtp/android/library/ConversationV2.kt b/library/src/main/java/org/xmtp/android/library/ConversationV2.kt
@@ -28,7 +28,6 @@ data class ConversationV2(
     val context: Invitation.InvitationV1.Context,
     val peerAddress: String,
     val client: Client,
-    val isGroup: Boolean = false,
     private val header: SealedInvitationHeaderV1,
 ) {
 
@@ -37,7 +36,6 @@ data class ConversationV2(
             client: Client,
             invitation: Invitation.InvitationV1,
             header: SealedInvitationHeaderV1,
-            isGroup: Boolean = false,
         ): ConversationV2 {
             val myKeys = client.keys.getPublicKeyBundle()
             val peer =
@@ -51,7 +49,6 @@ data class ConversationV2(
                 peerAddress = peerAddress,
                 client = client,
                 header = header,
-                isGroup = isGroup
             )
         }
     }

diff --git a/library/src/main/java/org/xmtp/android/library/Conversations.kt b/library/src/main/java/org/xmtp/android/library/Conversations.kt
@@ -169,13 +169,6 @@ data class Conversations(
                 Log.d(TAG, e.message.toString())
             }
         }
-        for (sealedInvitation in listGroupInvitations()) {
-            try {
-                newConversations.add(Conversation.V2(conversation(sealedInvitation, true)))
-            } catch (e: Exception) {
-                Log.d(TAG, e.message.toString())
-            }
-        }
 
         conversationsByTopic += newConversations.filter { it.peerAddress != client.address }
             .map { Pair(it.topic, it) }
@@ -203,7 +196,6 @@ data class Conversations(
                     context = data.invitation.context,
                     peerAddress = data.peerAddress,
                     client = client,
-                    isGroup = false,
                     header = Invitation.SealedInvitationHeaderV1.getDefaultInstance()
                 )
             )
@@ -259,28 +251,12 @@ data class Conversations(
         }
     }
 
-    private fun listGroupInvitations(): List<SealedInvitation> {
-        if (!client.isGroupChatEnabled) {
-            return listOf()
-        }
-        val envelopes = runBlocking {
-            client.apiClient.envelopes(
-                topic = Topic.groupInvite(client.address).description,
-                pagination = null
-            )
-        }
-        return envelopes.map { envelope ->
-            SealedInvitation.parseFrom(envelope.message)
-        }
-    }
-
-    fun conversation(sealedInvitation: SealedInvitation, isGroup: Boolean = false): ConversationV2 {
+    fun conversation(sealedInvitation: SealedInvitation): ConversationV2 {
         val unsealed = sealedInvitation.v1.getInvitation(viewer = client.keys)
         return ConversationV2.create(
             client = client,
             invitation = unsealed,
             header = sealedInvitation.v1.header,
-            isGroup = isGroup
         )
     }
 

diff --git a/library/src/main/java/org/xmtp/android/library/GroupChat.kt b/library/src/main/java/org/xmtp/android/library/GroupChat.kt
diff --git a/library/src/main/java/org/xmtp/android/library/codecs/GroupChatMemberAddedCodec.kt b/library/src/main/java/org/xmtp/android/library/codecs/GroupChatMemberAddedCodec.kt
diff --git a/library/src/main/java/org/xmtp/android/library/codecs/GroupChatTitleChangedCodec.kt b/library/src/main/java/org/xmtp/android/library/codecs/GroupChatTitleChangedCodec.kt
diff --git a/library/src/main/java/org/xmtp/android/library/codecs/README.md b/library/src/main/java/org/xmtp/android/library/codecs/README.md
@@ -9,6 +9,7 @@ When you build an app with XMTP, all messages are encoded with a [content type](
 - `RemoteAttachmentCodec`: Enables sending remote attachments.
 - `ReactionCodec`: Enables sending of reactions.
 - `ReplyCodec`: Enables sending of replies.
+- `ReadReceiptCodec`: Enables read receipts.
 
 
 ## Support remote media attachments