Add ability to send EncodedContent objects directly (#85)

* add api client with grpc kotlin

* add android side of enncoded sending

* write tests for it

* fix up th elint

* fix the test

Author: nplasterer

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

@@ -628,4 +628,27 @@ class ConversationTest {
         val noConversation = client.fetchConversation("invalid_topic")
         Assert.assertEquals(null, noConversation)
     }
+
+    @Test
+    fun testCanSendEncodedContentV1Message() {
+        fixtures.publishLegacyContact(client = bobClient)
+        fixtures.publishLegacyContact(client = aliceClient)
+        val bobConversation = bobClient.conversations.newConversation(aliceWallet.address)
+        val aliceConversation = aliceClient.conversations.newConversation(bobWallet.address)
+        val encodedContent = TextCodec().encode(content = "hi")
+        bobConversation.send(encodedContent = encodedContent)
+        val messages = aliceConversation.messages()
+        assertEquals(1, messages.size)
+        assertEquals("hi", messages[0].content())
+    }
+
+    @Test
+    fun testCanSendEncodedContentV2Message() {
+        val bobConversation = bobClient.conversations.newConversation(aliceWallet.address)
+        val encodedContent = TextCodec().encode(content = "hi")
+        bobConversation.send(encodedContent = encodedContent)
+        val messages = bobConversation.messages()
+        assertEquals(1, messages.size)
+        assertEquals("hi", messages[0].content())
+    }
 }

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

@@ -2,6 +2,7 @@ package org.xmtp.android.library
 
 import android.util.Log
 import kotlinx.coroutines.flow.Flow
+import org.xmtp.android.library.codecs.EncodedContent
 import org.xmtp.android.library.messages.Envelope
 import java.util.Date
 
@@ -104,6 +105,12 @@ sealed class Conversation {
         }
     }
 
+    fun send(encodedContent: EncodedContent): String {
+        return when (this) {
+            is V1 -> conversationV1.send(encodedContent = encodedContent)
+            is V2 -> conversationV2.send(encodedContent = encodedContent)
+        }
+    }
     val topic: String
         get() {
             return when (this) {

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

@@ -97,8 +97,13 @@ data class ConversationV1(
         return preparedMessage.messageId
     }
 
+    fun send(encodedContent: EncodedContent): String {
+        val preparedMessage = prepareMessage(encodedContent = encodedContent)
+        preparedMessage.send()
+        return preparedMessage.messageId
+    }
+
     fun <T> prepareMessage(content: T, options: SendOptions?): PreparedMessage {
-        val contact = client.contacts.find(peerAddress) ?: throw XMTPException("address not found")
         val codec = Client.codecRegistry.find(options?.contentType)
 
         fun <Codec : ContentCodec<T>> encode(codec: Codec, content: Any?): EncodedContent {
@@ -118,6 +123,11 @@ data class ConversationV1(
         if (compression != null) {
             encoded = encoded.compress(compression)
         }
+        return prepareMessage(encodedContent = encoded)
+    }
+
+    fun prepareMessage(encodedContent: EncodedContent): PreparedMessage {
+        val contact = client.contacts.find(peerAddress) ?: throw XMTPException("address not found")
         val recipient = contact.toPublicKeyBundle()
         if (!recipient.identityKey.hasSignature()) {
             throw Exception("no signature for id key")
@@ -126,7 +136,7 @@ data class ConversationV1(
         val message = MessageV1Builder.buildEncode(
             sender = client.privateKeyBundleV1,
             recipient = recipient,
-            message = encoded.toByteArray(),
+            message = encodedContent.toByteArray(),
             timestamp = date
         )
         val messageEnvelope =

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

@@ -37,7 +37,7 @@ data class ConversationV2(
             client: Client,
             invitation: Invitation.InvitationV1,
             header: SealedInvitationHeaderV1,
-            isGroup: Boolean = false
+            isGroup: Boolean = false,
         ): ConversationV2 {
             val myKeys = client.keys.getPublicKeyBundle()
             val peer =
@@ -114,6 +114,12 @@ data class ConversationV2(
         return preparedMessage.messageId
     }
 
+    fun send(encodedContent: EncodedContent): String {
+        val preparedMessage = prepareMessage(encodedContent = encodedContent)
+        preparedMessage.send()
+        return preparedMessage.messageId
+    }
+
     fun <Codec : ContentCodec<T>, T> encode(codec: Codec, content: T): ByteArray {
         val encodedContent = codec.encode(content = content)
         val message = MessageV2Builder.buildEncode(
@@ -150,9 +156,13 @@ data class ConversationV2(
         if (compression != null) {
             encoded = encoded.compress(compression)
         }
+        return prepareMessage(encoded)
+    }
+
+    fun prepareMessage(encodedContent: EncodedContent): PreparedMessage {
         val message = MessageV2Builder.buildEncode(
             client = client,
-            encodedContent = encoded,
+            encodedContent = encodedContent,
             topic = topic,
             keyMaterial = keyMaterial
         )