From 84c6a2f59b5cd6352aafd061130ea36e401cb11d Mon Sep 17 00:00:00 2001 From: Jorge Martin Espinosa Date: Thu, 26 Sep 2024 11:37:08 +0200 Subject: [PATCH] Fix room settings not treating unencrypted DMs as DMs (#3545) --- .../android/libraries/matrix/ui/room/MatrixRoomMembers.kt | 2 +- .../android/libraries/matrix/ui/room/MatrixRoomMembersTest.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/MatrixRoomMembers.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/MatrixRoomMembers.kt index 0c90c94f58..974b18d63c 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/MatrixRoomMembers.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/MatrixRoomMembers.kt @@ -44,7 +44,7 @@ fun MatrixRoom.getDirectRoomMember(roomMembersState: MatrixRoomMembersState): St derivedStateOf { roomMembers ?.filter { it.membership.isActive() } - ?.takeIf { it.size == 2 && isDirect && isEncrypted } + ?.takeIf { it.size == 2 && isDirect } ?.find { it.userId != sessionId } } } diff --git a/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/room/MatrixRoomMembersTest.kt b/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/room/MatrixRoomMembersTest.kt index ad46b08979..df8468f5ea 100644 --- a/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/room/MatrixRoomMembersTest.kt +++ b/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/room/MatrixRoomMembersTest.kt @@ -60,7 +60,7 @@ class MatrixRoomMembersTest { } @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( sessionId = A_USER_ID, isEncrypted = false, @@ -71,7 +71,7 @@ class MatrixRoomMembersTest { MatrixRoomMembersState.Ready(persistentListOf(roomMember1, roomMember2)) ) }.test { - assertThat(awaitItem().value).isNull() + assertThat(awaitItem().value).isEqualTo(roomMember2) } }