everything takes a subscribe2 now

Author: nplasterer

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

@@ -191,7 +191,7 @@ class FakeApiClient : ApiClient {
         published.addAll(envelopes)
         return PublishResponse.newBuilder().build()
     }
-    override suspend fun subscribe2(request: Flow<MessageApiOuterClass.SubscribeRequest>): Flow<MessageApiOuterClass.Envelope> {
+    override suspend fun subscribe(request: Flow<MessageApiOuterClass.SubscribeRequest>): Flow<MessageApiOuterClass.Envelope> {
         val env = stream.counts().first()
 
         if (request.first().contentTopicsList.contains(env.contentTopic)) {

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

@@ -34,7 +34,7 @@ interface ApiClient {
     suspend fun batchQuery(requests: List<QueryRequest>): BatchQueryResponse
     suspend fun envelopes(topic: String, pagination: Pagination? = null): List<Envelope>
     suspend fun publish(envelopes: List<Envelope>): PublishResponse
-    suspend fun subscribe2(request: Flow<SubscribeRequest>): Flow<Envelope>
+    suspend fun subscribe(request: Flow<SubscribeRequest>): Flow<Envelope>
 }
 
 data class GRPCApiClient(
@@ -182,7 +182,7 @@ data class GRPCApiClient(
         return client.publish(request, headers)
     }
 
-    override suspend fun subscribe2(request: Flow<SubscribeRequest>): Flow<Envelope> {
+    override suspend fun subscribe(request: Flow<SubscribeRequest>): Flow<Envelope> {
         val headers = Metadata()
 
         headers.put(CLIENT_VERSION_HEADER_KEY, Constants.VERSION)

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

@@ -497,8 +497,8 @@ class Client() {
         return apiClient.batchQuery(requests)
     }
 
-    suspend fun subscribe2(request: Flow<MessageApiOuterClass.SubscribeRequest>): Flow<Envelope> {
-        return apiClient.subscribe2(request = request)
+    suspend fun subscribe(request: Flow<MessageApiOuterClass.SubscribeRequest>): Flow<Envelope> {
+        return apiClient.subscribe(request = request)
     }
 
     fun fetchConversation(topic: String?, includeGroups: Boolean = false): Conversation? {

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

@@ -42,7 +42,7 @@ data class ConversationV1(
      * @see Conversations.streamAllMessages
      */
     fun streamMessages(): Flow<DecodedMessage> = flow {
-        client.subscribe2(
+        client.subscribe(
             MutableStateFlow(
                 GRPCApiClient.makeSubscribeRequest(
                     listOf(topic.description)
@@ -279,7 +279,7 @@ data class ConversationV1(
         get() = topic.description.replace("/xmtp/0/dm-", "/xmtp/0/dmE-")
 
     fun streamEphemeral(): Flow<Envelope> = flow {
-        client.subscribe2(
+        client.subscribe(
             MutableStateFlow(
                 GRPCApiClient.makeSubscribeRequest(
                     listOf(ephemeralTopic)
@@ -291,7 +291,7 @@ data class ConversationV1(
     }
 
     fun streamDecryptedMessages(): Flow<DecryptedMessage> = flow {
-        client.subscribe2(
+        client.subscribe(
             MutableStateFlow(
                 GRPCApiClient.makeSubscribeRequest(
                     listOf(topic.description)

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

@@ -139,7 +139,7 @@ data class ConversationV2(
     }
 
     fun streamMessages(): Flow<DecodedMessage> = flow {
-        client.subscribe2(
+        client.subscribe(
             MutableStateFlow(
                 GRPCApiClient.makeSubscribeRequest(
                     listOf(topic)
@@ -276,7 +276,7 @@ data class ConversationV2(
         get() = topic.replace("/xmtp/0/m", "/xmtp/0/mE")
 
     fun streamEphemeral(): Flow<Envelope> = flow {
-        client.subscribe2(
+        client.subscribe(
             MutableStateFlow(
                 GRPCApiClient.makeSubscribeRequest(
                     listOf(ephemeralTopic)
@@ -288,7 +288,7 @@ data class ConversationV2(
     }
 
     fun streamDecryptedMessages(): Flow<DecryptedMessage> = flow {
-        client.subscribe2(
+        client.subscribe(
             MutableStateFlow(
                 GRPCApiClient.makeSubscribeRequest(
                     listOf(topic)

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

@@ -526,7 +526,7 @@ data class Conversations(
      */
     fun stream(): Flow<Conversation> = flow {
         val streamedConversationTopics: MutableSet<String> = mutableSetOf()
-        client.subscribe2(
+        client.subscribe(
             MutableStateFlow(
                 makeSubscribeRequest(
                     listOf(
@@ -621,7 +621,7 @@ data class Conversations(
 
         while (true) {
             try {
-                client.subscribe2(request = subscribeFlow).collect { envelope ->
+                client.subscribe(request = subscribeFlow).collect { envelope ->
                     when {
                         conversationsByTopic.containsKey(envelope.contentTopic) -> {
                             val conversation = conversationsByTopic[envelope.contentTopic]
@@ -692,7 +692,7 @@ data class Conversations(
 
         while (true) {
             try {
-                client.subscribe2(request = subscribeFlow).collect { envelope ->
+                client.subscribe(request = subscribeFlow).collect { envelope ->
                     when {
                         conversationsByTopic.containsKey(envelope.contentTopic) -> {
                             val conversation = conversationsByTopic[envelope.contentTopic]

library/src/test/java/org/xmtp/android/library/TestHelpers.kt

@@ -187,7 +187,7 @@ class FakeApiClient : ApiClient {
         return PublishResponse.newBuilder().build()
     }
 
-    override suspend fun subscribe2(request: Flow<MessageApiOuterClass.SubscribeRequest>): Flow<MessageApiOuterClass.Envelope> {
+    override suspend fun subscribe(request: Flow<MessageApiOuterClass.SubscribeRequest>): Flow<MessageApiOuterClass.Envelope> {
         val env = stream.counts().first()
 
         if (request.first().contentTopicsList.contains(env.contentTopic)) {