Skip to content

Commit 2ce8bb7

Browse files
authored
Fix room settings not treating unencrypted DMs as DMs (#3545)
1 parent 71c0eb1 commit 2ce8bb7

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ fun MatrixRoom.getDirectRoomMember(roomMembersState: MatrixRoomMembersState): St
4444
derivedStateOf {
4545
roomMembers
4646
?.filter { it.membership.isActive() }
47-
?.takeIf { it.size == 2 && isDirect && isEncrypted }
47+
?.takeIf { it.size == 2 && isDirect }
4848
?.find { it.userId != sessionId }
4949
}
5050
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class MatrixRoomMembersTest {
6060
}
6161

6262
@Test
63-
fun `getDirectRoomMember emit null if the room is not encrypted`() = runTest {
63+
fun `getDirectRoomMember emits other member even if the room is not encrypted`() = runTest {
6464
val matrixRoom = FakeMatrixRoom(
6565
sessionId = A_USER_ID,
6666
isEncrypted = false,
@@ -71,7 +71,7 @@ class MatrixRoomMembersTest {
7171
MatrixRoomMembersState.Ready(persistentListOf(roomMember1, roomMember2))
7272
)
7373
}.test {
74-
assertThat(awaitItem().value).isNull()
74+
assertThat(awaitItem().value).isEqualTo(roomMember2)
7575
}
7676
}
7777

0 commit comments

Comments
 (0)