Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: support import/export of conversations by TopicData #64

Merged
merged 1 commit into from
Jun 26, 2023
Merged

feat: support import/export of conversations by TopicData #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,6 @@ repositories {
dependencies {
implementation project(':expo-modules-core')
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${getKotlinVersion()}"
implementation "org.xmtp:android:0.2.0"
implementation "org.xmtp:android:0.3.0"
implementation 'com.google.code.gson:gson:2.10.1'
}
48 changes: 27 additions & 21 deletions android/src/main/java/expo/modules/xmtpreactnativesdk/XMTPModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import org.xmtp.android.library.messages.InvitationV1ContextBuilder
import org.xmtp.android.library.messages.PrivateKeyBuilder
import org.xmtp.android.library.messages.Signature
import org.xmtp.android.library.push.XMTPPush
import org.xmtp.proto.keystore.api.v1.Keystore.TopicMap.TopicData
import org.xmtp.proto.message.contents.SignatureOuterClass
import org.xmtp.proto.message.contents.PrivateKeyOuterClass
import java.util.Date
Expand Down Expand Up @@ -72,11 +73,7 @@ data class SignatureRequest(
)

fun Conversation.cacheKey(clientAddress: String): String {
return if (conversationId != "") {
"${clientAddress}:${topic}:${conversationId}"
} else {
"${clientAddress}:${topic}"
}
return "${clientAddress}:${topic}"
}

class XMTPModule : Module() {
Expand Down Expand Up @@ -150,6 +147,25 @@ class XMTPModule : Module() {
Base64.encodeToString(client.privateKeyBundle.toByteArray(), NO_WRAP)
}

// Export the conversation's serialized topic data.
AsyncFunction("exportConversationTopicData") { clientAddress: String, topic: String ->
logV("exportConversationTopicData")
val client = clients[clientAddress] ?: throw XMTPException("No client")
val conversation = findConversation(clientAddress, topic)
?: throw XMTPException("no conversation found for $topic")
Base64.encodeToString(conversation.toTopicData().toByteArray(), NO_WRAP)
}

// Import a conversation from its serialized topic data.
AsyncFunction("importConversationTopicData") { clientAddress: String, topicData: String ->
logV("importConversationTopicData")
val client = clients[clientAddress] ?: throw XMTPException("No client")
val data = TopicData.parseFrom(Base64.decode(topicData, NO_WRAP))
val conversation = client.conversations.importTopicData(data)
conversations[conversation.cacheKey(clientAddress)] = conversation
ConversationWrapper.encode(ConversationWithClientAddress(client, conversation))
}

//
// Client API
AsyncFunction("canMessage") { clientAddress: String, peerAddress: String ->
Expand Down Expand Up @@ -186,8 +202,7 @@ class XMTPModule : Module() {
val conversation =
findConversation(
clientAddress = clientAddress,
topic = conversationTopic,
conversationId = conversationID
topic = conversationTopic
)
?: throw XMTPException("no conversation found for $conversationTopic")
val preparedMessage = conversation.prepareMessage(content = content)
Expand Down Expand Up @@ -260,8 +275,7 @@ class XMTPModule : Module() {
val conversation =
findConversation(
clientAddress = clientAddress,
topic = topic,
conversationId = conversationID
topic = topic
)
?: throw XMTPException("no conversation found for $topic")
val decodedMessage = conversation.decode(envelope)
Expand All @@ -275,22 +289,16 @@ class XMTPModule : Module() {
private fun findConversation(
clientAddress: String,
topic: String,
conversationId: String?,
): Conversation? {
val client = clients[clientAddress] ?: throw XMTPException("No client")

val cacheKey: String = if (!conversationId.isNullOrBlank()) {
"${clientAddress}:${topic}:${conversationId}"
} else {
"${clientAddress}:${topic}"
}

val cacheKey = "${clientAddress}:${topic}"
val cacheConversation = conversations[cacheKey]
if (cacheConversation != null) {
return cacheConversation
} else {
val conversation = client.conversations.list()
.firstOrNull { it.topic == topic && it.conversationId == conversationId }
.firstOrNull { it.topic == topic }
if (conversation != null) {
conversations[conversation.cacheKey(clientAddress)] = conversation
return conversation
Expand Down Expand Up @@ -349,8 +357,7 @@ class XMTPModule : Module() {
val conversation =
findConversation(
clientAddress = clientAddress,
topic = topic,
conversationId = conversationId
topic = topic
) ?: return
subscriptions[conversation.cacheKey(clientAddress)] =
CoroutineScope(Dispatchers.IO).launch {
Expand Down Expand Up @@ -380,8 +387,7 @@ class XMTPModule : Module() {
val conversation =
findConversation(
clientAddress = clientAddress,
topic = topic,
conversationId = conversationId
topic = topic
) ?: return
subscriptions[conversation.cacheKey(clientAddress)]?.cancel()
}
Expand Down
Loading