Skip to content

Prepare v1.6.2 #755

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

Open
neekolas wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Prepare v1.6.2 #755

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 @@ -95,7 +95,7 @@ repositories {
dependencies {
implementation project(':expo-modules-core')
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${getKotlinVersion()}"
implementation "org.xmtp:android:4.6.1"
implementation "org.xmtp:android:4.6.2"
implementation 'com.google.code.gson:gson:2.10.1'
implementation 'com.facebook.react:react-native:0.71.3'
implementation "com.daveanthonythomas.moshipack:moshipack:1.0.1"
Expand Down
64 changes: 51 additions & 13 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 @@ -26,6 +26,7 @@ import expo.modules.xmtpreactnativesdk.wrappers.DecryptedLocalAttachment
import expo.modules.xmtpreactnativesdk.wrappers.DisappearingMessageSettingsWrapper
import expo.modules.xmtpreactnativesdk.wrappers.DmWrapper
import expo.modules.xmtpreactnativesdk.wrappers.EncryptedLocalAttachment
import expo.modules.xmtpreactnativesdk.wrappers.GroupSyncSummaryWrapper
import expo.modules.xmtpreactnativesdk.wrappers.GroupWrapper
import expo.modules.xmtpreactnativesdk.wrappers.InboxStateWrapper
import expo.modules.xmtpreactnativesdk.wrappers.KeyPackageStatusWrapper
Expand Down Expand Up @@ -584,7 +585,7 @@ class XMTPModule : Module() {
logV("ffiRevokeAllOtherInstallationsSignatureText")
val client = clients[installationId] ?: throw XMTPException("No client")
val sigRequest = client.ffiRevokeAllOtherInstallations()
sigRequest.let {
sigRequest?.let {
clientSignatureRequests[installationId] = it
it.signatureText()
}
Expand Down Expand Up @@ -1012,7 +1013,10 @@ class XMTPModule : Module() {
afterNs = queryParams.afterNs,
direction = DecodedMessage.SortDirection.valueOf(
queryParams.direction ?: "DESCENDING"
)
),
insertedAfterNs = queryParams.insertedAfterNs,
insertedBeforeNs = queryParams.insertedBeforeNs,
sortBy = getMessageSortBy(queryParams.sortBy)
)?.map { MessageWrapper.encode(it) }
}
}
Expand All @@ -1029,7 +1033,10 @@ class XMTPModule : Module() {
afterNs = queryParams.afterNs,
direction = DecodedMessage.SortDirection.valueOf(
queryParams.direction ?: "DESCENDING"
)
),
insertedAfterNs = queryParams.insertedAfterNs,
insertedBeforeNs = queryParams.insertedBeforeNs,
sortBy = getMessageSortBy(queryParams.sortBy)
)?.map { MessageWrapper.encode(it) }
}
}
Expand Down Expand Up @@ -1224,7 +1231,8 @@ class XMTPModule : Module() {
createGroupParams.groupName,
createGroupParams.groupImageUrl,
createGroupParams.groupDescription,
createGroupParams.disappearingMessageSettings
createGroupParams.disappearingMessageSettings,
createGroupParams.appData
)
GroupWrapper.encode(client, group)
}
Expand All @@ -1246,7 +1254,8 @@ class XMTPModule : Module() {
createGroupParams.groupName,
createGroupParams.groupImageUrl,
createGroupParams.groupDescription,
createGroupParams.disappearingMessageSettings
createGroupParams.disappearingMessageSettings,
createGroupParams.appData
)
GroupWrapper.encode(client, group)
}
Expand All @@ -1270,7 +1279,8 @@ class XMTPModule : Module() {
createGroupParams.groupName,
createGroupParams.groupImageUrl,
createGroupParams.groupDescription,
createGroupParams.disappearingMessageSettings
createGroupParams.disappearingMessageSettings,
createGroupParams.appData
)
GroupWrapper.encode(client, group)
}
Expand All @@ -1294,7 +1304,8 @@ class XMTPModule : Module() {
createGroupParams.groupName,
createGroupParams.groupImageUrl,
createGroupParams.groupDescription,
createGroupParams.disappearingMessageSettings
createGroupParams.disappearingMessageSettings,
createGroupParams.appData
)
GroupWrapper.encode(client, group)
}
Expand All @@ -1315,7 +1326,8 @@ class XMTPModule : Module() {
createGroupParams.groupName,
createGroupParams.groupImageUrl,
createGroupParams.groupDescription,
createGroupParams.disappearingMessageSettings
createGroupParams.disappearingMessageSettings,
createGroupParams.appData
)
GroupWrapper.encode(client, group)
}
Expand Down Expand Up @@ -1365,9 +1377,8 @@ class XMTPModule : Module() {
logV("syncAllConversations")
val client = clients[installationId] ?: throw XMTPException("No client")
val consentStates = consentStringStates?.let { ConsentWrapper.getConsentStates(it) }
val numGroupsSyncedInt: Int =
client.conversations.syncAllConversations(consentStates).numSynced.toInt()
numGroupsSyncedInt
val summary = client.conversations.syncAllConversations(consentStates)
GroupSyncSummaryWrapper.encode(summary)
}
}

Expand Down Expand Up @@ -1485,6 +1496,26 @@ class XMTPModule : Module() {
}
}

AsyncFunction("groupAppData") Coroutine { installationId: String, groupId: String ->
withContext(Dispatchers.IO) {
logV("groupAppData")
val client = clients[installationId] ?: throw XMTPException("No client")
val group = client.conversations.findGroup(groupId)
?: throw XMTPException("no group found for $groupId")
group.appData()
}
}

AsyncFunction("updateGroupAppData") Coroutine { installationId: String, groupId: String, appData: String ->
withContext(Dispatchers.IO) {
logV("updateGroupAppData")
val client = clients[installationId] ?: throw XMTPException("No client")
val group = client.conversations.findGroup(groupId)
?: throw XMTPException("no group found for $groupId")
group.updateAppData(appData)
}
}

AsyncFunction("disappearingMessageSettings") Coroutine { installationId: String, conversationId: String ->
withContext(Dispatchers.IO) {
logV("disappearingMessageSettings")
Expand Down Expand Up @@ -2029,15 +2060,15 @@ class XMTPModule : Module() {
}
}

AsyncFunction("createArchive") Coroutine { installationId: String, path: String, encryptionKey: List<Int>, startNs: Int?, endNs: Int?, archiveElements: List<String>? ->
AsyncFunction("createArchive") Coroutine { installationId: String, path: String, encryptionKey: List<Int>, startNs: Int?, endNs: Int?, archiveElements: List<String>?, excludeDisappearingMessages: Boolean? ->
withContext(Dispatchers.IO) {
val client = clients[installationId] ?: throw XMTPException("No client")
val encryptionKeyBytes =
encryptionKey.foldIndexed(ByteArray(encryptionKey.size)) { i, a, v ->
a.apply { set(i, v.toByte()) }
}
val elements = archiveElements?.map { getArchiveElement(it) } ?: listOf(ArchiveElement.MESSAGES, ArchiveElement.CONSENT)
val archiveOptions = ArchiveOptions(startNs?.toLong(), endNs?.toLong(), elements)
val archiveOptions = ArchiveOptions(startNs?.toLong(), endNs?.toLong(), elements, excludeDisappearingMessages ?: false)
client.createArchive(path, encryptionKeyBytes, archiveOptions)
}
}
Expand Down Expand Up @@ -2348,6 +2379,13 @@ class XMTPModule : Module() {
}
}

private fun getMessageSortBy(sortBy: String?): DecodedMessage.SortBy {
return when (sortBy) {
"INSERTED_TIME" -> DecodedMessage.SortBy.INSERTED_TIME
else -> DecodedMessage.SortBy.SENT_TIME
}
}

private val preAuthenticateToInboxCallback: suspend () -> Unit = {
sendEvent("preAuthenticateToInboxCallback")
preAuthenticateToInboxCallbackDeferred?.await()
Expand Down
Loading
Loading