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

Fix: peer addresses actually returns peer addresses #188

Merged
merged 1 commit into from
Feb 22, 2024
Merged

Fix: peer addresses actually returns peer addresses #188

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
14 changes: 10 additions & 4 deletions library/src/androidTest/java/org/xmtp/android/library/GroupTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,14 @@ class GroupTest {
bo.walletAddress.lowercase()
).sorted()
)

assertEquals(
Conversation.Group(group).peerAddresses.sorted(),
listOf(
caro.walletAddress.lowercase(),
alix.walletAddress.lowercase(),
).sorted()
)
}

@Test
Expand Down Expand Up @@ -430,8 +438,7 @@ class GroupTest {
)

var result = boClient.contacts.isGroupAllowed(group.id)

assert(!result)
assert(result)

boClient.contacts.allowGroup(listOf(group.id))

Expand All @@ -448,8 +455,7 @@ class GroupTest {
)
)
var result = boClient.contacts.isGroupAllowed(group.id)

assert(!result)
assert(result)

boClient.contacts.denyGroup(listOf(group.id))

Expand Down
12 changes: 2 additions & 10 deletions library/src/main/java/org/xmtp/android/library/Conversation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,7 @@ sealed class Conversation {
return when (this) {
is V1 -> conversationV1.peerAddress
is V2 -> conversationV2.peerAddress
is Group -> {
val addresses = group.memberAddresses().toMutableList()
addresses.remove(clientAddress)
addresses.joinToString(",")
}
is Group -> group.peerAddresses().joinToString(",")
}
}

Expand All @@ -68,11 +64,7 @@ sealed class Conversation {
return when (this) {
is V1 -> listOf(conversationV1.peerAddress)
is V2 -> listOf(conversationV2.peerAddress)
is Group -> {
val addresses = group.memberAddresses().toMutableList()
addresses.remove(clientAddress)
addresses
}
is Group -> group.peerAddresses()
}
}

Expand Down
6 changes: 6 additions & 0 deletions library/src/main/java/org/xmtp/android/library/Group.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,12 @@ class Group(val client: Client, private val libXMTPGroup: FfiGroup) {
}
}

fun peerAddresses(): List<String> {
val addresses = memberAddresses().map { it.lowercase() }.toMutableList()
addresses.remove(client.address.lowercase())
return addresses
}

fun streamMessages(): Flow<DecodedMessage> = callbackFlow {
val messageCallback = object : FfiMessageCallback {
override fun onMessage(message: FfiMessage) {
Expand Down
Loading