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

Group Message Kind #217

Merged
merged 15 commits into from
Apr 9, 2024
+145 −24
Merged

Group Message Kind #217

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
ffadc1b
add new xmtpv3 message kind
nplasterer Apr 6, 2024
354f42a
add the update jnilibs
nplasterer Apr 8, 2024
7ce43c1
do a rename to messageV3 and tweaks to add message kind to the message
nplasterer Apr 8, 2024
680ba92
add tests for it
nplasterer Apr 8, 2024
461c098
move where message kind lives
nplasterer Apr 8, 2024
d5dc180
filter them out of the message list
nplasterer Apr 8, 2024
95c8205
filter them out of the stream
nplasterer Apr 8, 2024
fc482a9
filter the stream all as well
nplasterer Apr 8, 2024
f55fd75
add tests
nplasterer Apr 8, 2024
a42a425
fix up the linter issues
nplasterer Apr 8, 2024
e44fe6d
fix example
nplasterer Apr 8, 2024
c7cab9c
make sure the tests run on local
nplasterer Apr 9, 2024
fcb5ae1
add the libxmtp version
nplasterer Apr 9, 2024
6cc22bc
tweak this so it happens in the decode methods instea
nplasterer Apr 9, 2024
e428bfd
fix up the linter
nplasterer Apr 9, 2024
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
12 changes: 10 additions & 2 deletions library/src/main/java/org/xmtp/android/library/Conversations.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import org.xmtp.android.library.messages.DecryptedMessage
import org.xmtp.android.library.messages.Envelope
import org.xmtp.android.library.messages.EnvelopeBuilder
import org.xmtp.android.library.messages.InvitationV1
import org.xmtp.android.library.messages.MessageKind
import org.xmtp.android.library.messages.MessageV1Builder
import org.xmtp.android.library.messages.Pagination
import org.xmtp.android.library.messages.SealedInvitation
Expand Down Expand Up @@ -46,6 +47,7 @@ import uniffi.xmtpv3.FfiListConversationsOptions
import uniffi.xmtpv3.FfiMessage
import uniffi.xmtpv3.FfiMessageCallback
import uniffi.xmtpv3.GroupPermissions
import uniffi.xmtpv3.org.xmtp.android.library.codecs.ContentTypeGroupMembershipChange
import java.util.Date
import kotlin.time.Duration.Companion.nanoseconds
import kotlin.time.DurationUnit
Expand Down Expand Up @@ -576,7 +578,10 @@ data class Conversations(
fun streamAllGroupMessages(): Flow<DecodedMessage> = callbackFlow {
val messageCallback = object : FfiMessageCallback {
override fun onMessage(message: FfiMessage) {
trySend(MessageV3(client, message).decode())
val decodedMessage = MessageV3(client, message).decode()
if (!(decodedMessage.encodedContent.type == ContentTypeGroupMembershipChange && decodedMessage.kind != MessageKind.MEMBERSHIP_CHANGE)) {
trySend(decodedMessage)
}
nplasterer marked this conversation as resolved.
Show resolved Hide resolved
}
}
val stream = libXMTPConversations?.streamAllMessages(messageCallback)
Expand All @@ -587,7 +592,10 @@ data class Conversations(
fun streamAllGroupDecryptedMessages(): Flow<DecryptedMessage> = callbackFlow {
val messageCallback = object : FfiMessageCallback {
override fun onMessage(message: FfiMessage) {
trySend(MessageV3(client, message).decrypt())
val decryptedMessage = MessageV3(client, message).decrypt()
if (!(decryptedMessage.encodedContent.type == ContentTypeGroupMembershipChange && decryptedMessage.kind != MessageKind.MEMBERSHIP_CHANGE)) {
trySend(decryptedMessage)
}
}
}
val stream = libXMTPConversations?.streamAllMessages(messageCallback)
Expand Down
Loading