Skip to content

Commit f5af056

Browse files
committed
change all these places to the topic
1 parent 7d213e4 commit f5af056

File tree

5 files changed

+11
-4
lines changed

5 files changed

+11
-4
lines changed

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

+1
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ class ClientTest {
123123
)
124124
)
125125
assert(client.canMessageV3(listOf(client.address)))
126+
assert(client.installationIds.isNotEmpty())
126127
}
127128

128129
@Test

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ class GroupTest {
494494
boClient.conversations.streamAll().test {
495495
val group =
496496
caroClient.conversations.newGroup(listOf(bo.walletAddress))
497-
assertEquals(group.id.toHex(), awaitItem().topic)
497+
assertEquals(group.topic, awaitItem().topic)
498498
val conversation =
499499
alixClient.conversations.newConversation(bo.walletAddress)
500500
assertEquals(conversation.topic, awaitItem().topic)

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import org.xmtp.android.library.libxmtp.Message
88
import org.xmtp.android.library.messages.DecryptedMessage
99
import org.xmtp.android.library.messages.Envelope
1010
import org.xmtp.android.library.messages.PagingInfoSortDirection
11+
import org.xmtp.android.library.messages.Topic
1112
import org.xmtp.proto.keystore.api.v1.Keystore.TopicMap.TopicData
1213
import org.xmtp.proto.message.api.v1.MessageApiOuterClass
1314
import org.xmtp.proto.message.contents.Invitation
@@ -212,7 +213,7 @@ sealed class Conversation {
212213
return when (this) {
213214
is V1 -> conversationV1.topic.description
214215
is V2 -> conversationV2.topic
215-
is Group -> group.id.toHex()
216+
is Group -> group.topic
216217
}
217218
}
218219

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

+4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import org.xmtp.android.library.codecs.compress
99
import org.xmtp.android.library.libxmtp.Message
1010
import org.xmtp.android.library.messages.DecryptedMessage
1111
import org.xmtp.android.library.messages.PagingInfoSortDirection
12+
import org.xmtp.android.library.messages.Topic
1213
import org.xmtp.proto.message.api.v1.MessageApiOuterClass
1314
import uniffi.xmtpv3.FfiGroup
1415
import uniffi.xmtpv3.FfiGroupMetadata
@@ -24,6 +25,9 @@ class Group(val client: Client, private val libXMTPGroup: FfiGroup) {
2425
val id: ByteArray
2526
get() = libXMTPGroup.id()
2627

28+
val topic: String
29+
get() = Topic.groupMessage(id.toHex()).description
30+
2731
val createdAt: Date
2832
get() = Date(libXMTPGroup.createdAtNs() / 1_000_000)
2933

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import org.xmtp.android.library.DecodedMessage
55
import org.xmtp.android.library.XMTPException
66
import org.xmtp.android.library.codecs.EncodedContent
77
import org.xmtp.android.library.messages.DecryptedMessage
8+
import org.xmtp.android.library.messages.Topic
89
import org.xmtp.android.library.toHex
910
import uniffi.xmtpv3.FfiMessage
1011
import java.util.Date
@@ -27,7 +28,7 @@ data class Message(val client: Client, private val libXMTPMessage: FfiMessage) {
2728
return DecodedMessage(
2829
id = id.toHex(),
2930
client = client,
30-
topic = id.toHex(),
31+
topic = Topic.groupMessage(convoId.toHex()).description,
3132
encodedContent = EncodedContent.parseFrom(libXMTPMessage.content),
3233
senderAddress = senderAddress,
3334
sent = sentAt
@@ -40,7 +41,7 @@ data class Message(val client: Client, private val libXMTPMessage: FfiMessage) {
4041
fun decrypt(): DecryptedMessage {
4142
return DecryptedMessage(
4243
id = id.toHex(),
43-
topic = convoId.toHex(),
44+
topic = Topic.groupMessage(convoId.toHex()).description,
4445
encodedContent = decode().encodedContent,
4546
senderAddress = senderAddress,
4647
sentAt = Date()

0 commit comments

Comments
 (0)