Sulkta-OSS/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix room settings not treating unencrypted DMs as DMs (#3545)

Browse source
This commit is contained in:
Jorge Martin Espinosa 2024-09-26 11:37:08 +02:00 • committed by GitHub
parent 71c0eb19b2
commit 2ce8bb7682
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/MatrixRoomMembers.kt
View file

@ -44,7 +44,7 @@ fun MatrixRoom.getDirectRoomMember(roomMembersState: MatrixRoomMembersState): St
derivedStateOf { derivedStateOf {
roomMembers roomMembers
?.filter { it.membership.isActive() } ?.filter { it.membership.isActive() }
?.takeIf { it.size == 2 && isDirect && isEncrypted } ?.takeIf { it.size == 2 && isDirect }
?.find { it.userId != sessionId } ?.find { it.userId != sessionId }
} }
} }

4
libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/room/MatrixRoomMembersTest.kt
View file

@ -60,7 +60,7 @@ class MatrixRoomMembersTest {
} }
@Test @Test
fun `getDirectRoomMember emit null if the room is not encrypted`() = runTest { fun `getDirectRoomMember emits other member even if the room is not encrypted`() = runTest {
val matrixRoom = FakeMatrixRoom( val matrixRoom = FakeMatrixRoom(
sessionId = A_USER_ID, sessionId = A_USER_ID,
isEncrypted = false, isEncrypted = false,
@ -71,7 +71,7 @@ class MatrixRoomMembersTest {
MatrixRoomMembersState.Ready(persistentListOf(roomMember1, roomMember2)) MatrixRoomMembersState.Ready(persistentListOf(roomMember1, roomMember2))
) )
}.test { }.test {
assertThat(awaitItem().value).isNull() assertThat(awaitItem().value).isEqualTo(roomMember2)
} }
} }