Unify the way we decide whether a room is a DM or a group room (#3100)

* Add centralised 'room is DM' check

Also add extension functions for `MatrixRoom` and `MatrixRoomInfo`.

* Use the centralised method and extension functions through the app, including:

- Room list.
- Room details screen.
- Invites.
- Notifications.

Replace most `isDirect` usages with `isDm`.

* Update screenshots

---------

Co-authored-by: ElementBot <benoitm+elementbot@element.io>

features/invite/api/src/main/kotlin/io/element/android/features/invite/api/response/AcceptDeclineInviteStateProvider.kt

@@ -27,13 +27,13 @@ open class AcceptDeclineInviteStateProvider : PreviewParameterProvider<AcceptDec
             anAcceptDeclineInviteState(),
             anAcceptDeclineInviteState(
                 invite = Optional.of(
-                    InviteData(RoomId("!room:matrix.org"), isDirect = true, roomName = "Alice"),
+                    InviteData(RoomId("!room:matrix.org"), isDm = true, roomName = "Alice"),
                 ),
                 declineAction = AsyncAction.Confirming,
             ),
             anAcceptDeclineInviteState(
                 invite = Optional.of(
-                    InviteData(RoomId("!room:matrix.org"), isDirect = false, roomName = "Some room"),
+                    InviteData(RoomId("!room:matrix.org"), isDm = false, roomName = "Some room"),
                 ),
                 declineAction = AsyncAction.Confirming,
             ),

features/invite/api/src/main/kotlin/io/element/android/features/invite/api/response/InviteData.kt

@@ -21,5 +21,5 @@ import io.element.android.libraries.matrix.api.core.RoomId
 data class InviteData(
     val roomId: RoomId,
     val roomName: String,
-    val isDirect: Boolean,
+    val isDm: Boolean,
 )

features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/response/AcceptDeclineInviteView.kt

@@ -79,13 +79,13 @@ private fun DeclineConfirmationDialog(
     onDismissClick: () -> Unit,
     modifier: Modifier = Modifier
 ) {
-    val contentResource = if (invite.isDirect) {
+    val contentResource = if (invite.isDm) {
         R.string.screen_invites_decline_direct_chat_message
     } else {
         R.string.screen_invites_decline_chat_message
     }
 
-    val titleResource = if (invite.isDirect) {
+    val titleResource = if (invite.isDm) {
         R.string.screen_invites_decline_direct_chat_title
     } else {
         R.string.screen_invites_decline_chat_title

features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/response/AcceptDeclineInvitePresenterTest.kt

@@ -260,12 +260,12 @@ class AcceptDeclineInvitePresenterTest {
     private fun anInviteData(
         roomId: RoomId = A_ROOM_ID,
         name: String = A_ROOM_NAME,
-        isDirect: Boolean = false
+        isDm: Boolean = false
     ): InviteData {
         return InviteData(
             roomId = roomId,
             roomName = name,
-            isDirect = isDirect
+            isDm = isDm
         )
     }
 

features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenter.kt

@@ -45,6 +45,7 @@ import io.element.android.libraries.matrix.api.core.RoomIdOrAlias
 import io.element.android.libraries.matrix.api.room.CurrentUserMembership
 import io.element.android.libraries.matrix.api.room.MatrixRoomInfo
 import io.element.android.libraries.matrix.api.room.RoomType
+import io.element.android.libraries.matrix.api.room.isDm
 import io.element.android.libraries.matrix.api.room.join.JoinRoom
 import io.element.android.libraries.matrix.api.room.preview.RoomPreview
 import io.element.android.libraries.matrix.ui.model.toInviteSender
@@ -173,7 +174,7 @@ private fun RoomPreview.toContentState(): ContentState {
         topic = topic,
         alias = canonicalAlias,
         numberOfMembers = numberOfJoinedMembers,
-        isDirect = false,
+        isDm = false,
         roomType = roomType,
         roomAvatarUrl = avatarUrl,
         joinAuthorisationStatus = when {
@@ -194,7 +195,7 @@ internal fun RoomDescription.toContentState(): ContentState {
         topic = topic,
         alias = alias,
         numberOfMembers = numberOfMembers,
-        isDirect = false,
+        isDm = false,
         roomType = RoomType.Room,
         roomAvatarUrl = avatarUrl,
         joinAuthorisationStatus = when (joinRule) {
@@ -213,7 +214,7 @@ internal fun MatrixRoomInfo.toContentState(): ContentState {
         topic = topic,
         alias = canonicalAlias,
         numberOfMembers = activeMembersCount,
-        isDirect = isDirect,
+        isDm = isDm,
         roomType = if (isSpace) RoomType.Space else RoomType.Room,
         roomAvatarUrl = avatarUrl,
         joinAuthorisationStatus = when {
@@ -233,7 +234,7 @@ internal fun ContentState.toInviteData(): InviteData? {
             roomId = roomId,
             // Note: name should not be null at this point, but use Id just in case...
             roomName = name ?: roomId.value,
-            isDirect = isDirect
+            isDm = isDm
         )
         else -> null
     }

features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomState.kt

@@ -53,7 +53,7 @@ sealed interface ContentState {
         val topic: String?,
         val alias: RoomAlias?,
         val numberOfMembers: Long?,
-        val isDirect: Boolean,
+        val isDm: Boolean,
         val roomType: RoomType,
         val roomAvatarUrl: String?,
         val joinAuthorisationStatus: JoinAuthorisationStatus,

features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomStateProvider.kt

@@ -28,6 +28,7 @@ import io.element.android.libraries.matrix.api.core.RoomIdOrAlias
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.core.toRoomIdOrAlias
 import io.element.android.libraries.matrix.api.room.RoomType
+import io.element.android.libraries.matrix.api.room.isDm
 import io.element.android.libraries.matrix.ui.model.InviteSender
 
 open class JoinRoomStateProvider : PreviewParameterProvider<JoinRoomState> {
@@ -84,6 +85,12 @@ open class JoinRoomStateProvider : PreviewParameterProvider<JoinRoomState> {
                     roomType = RoomType.Space,
                 )
             ),
+            aJoinRoomState(
+                contentState = aLoadedContentState(
+                    name = "A DM",
+                    isDm = true,
+                )
+            ),
         )
 }
 
@@ -106,7 +113,7 @@ fun aLoadedContentState(
     alias: RoomAlias? = RoomAlias("#exa:matrix.org"),
     topic: String? = "Element X is a secure, private and decentralized messenger.",
     numberOfMembers: Long? = null,
-    isDirect: Boolean = false,
+    isDm: Boolean = false,
     roomType: RoomType = RoomType.Room,
     roomAvatarUrl: String? = null,
     joinAuthorisationStatus: JoinAuthorisationStatus = JoinAuthorisationStatus.Unknown
@@ -116,7 +123,7 @@ fun aLoadedContentState(
     alias = alias,
     topic = topic,
     numberOfMembers = numberOfMembers,
-    isDirect = isDirect,
+    isDm = isDm,
     roomType = roomType,
     roomAvatarUrl = roomAvatarUrl,
     joinAuthorisationStatus = joinAuthorisationStatus

features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenterTest.kt

@@ -93,7 +93,7 @@ class JoinRoomPresenterTest {
                 assertThat(contentState.topic).isEqualTo(roomInfo.topic)
                 assertThat(contentState.alias).isEqualTo(roomInfo.canonicalAlias)
                 assertThat(contentState.numberOfMembers).isEqualTo(roomInfo.activeMembersCount)
-                assertThat(contentState.isDirect).isEqualTo(roomInfo.isDirect)
+                assertThat(contentState.isDm).isEqualTo(roomInfo.isDirect)
                 assertThat(contentState.roomAvatarUrl).isEqualTo(roomInfo.avatarUrl)
             }
         }
@@ -283,7 +283,7 @@ class JoinRoomPresenterTest {
                 assertThat(contentState.topic).isEqualTo(roomDescription.topic)
                 assertThat(contentState.alias).isEqualTo(roomDescription.alias)
                 assertThat(contentState.numberOfMembers).isEqualTo(roomDescription.numberOfMembers)
-                assertThat(contentState.isDirect).isFalse()
+                assertThat(contentState.isDm).isFalse()
                 assertThat(contentState.roomAvatarUrl).isEqualTo(roomDescription.avatarUrl)
             }
         }
@@ -398,7 +398,7 @@ class JoinRoomPresenterTest {
                         topic = "Room topic",
                         alias = RoomAlias("#alias:matrix.org"),
                         numberOfMembers = 2,
-                        isDirect = false,
+                        isDm = false,
                         roomType = RoomType.Room,
                         roomAvatarUrl = "avatarUrl",
                         joinAuthorisationStatus = JoinAuthorisationStatus.CanJoin

features/leaveroom/impl/src/main/kotlin/io/element/android/features/leaveroom/impl/DefaultLeaveRoomPresenter.kt

@@ -34,6 +34,7 @@ import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.room.RoomMembershipObserver
+import io.element.android.libraries.matrix.api.room.isDm
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject

features/leaveroom/impl/src/test/kotlin/io/element/android/features/leaveroom/impl/DefaultLeaveRoomPresenterTest.kt

@@ -119,7 +119,7 @@ class DefaultLeaveRoomPresenterTest {
             client = FakeMatrixClient().apply {
                 givenGetRoomResult(
                     roomId = A_ROOM_ID,
-                    result = FakeMatrixRoom(activeMemberCount = 2, isDirect = true, isOneToOne = true),
+                    result = FakeMatrixRoom(activeMemberCount = 2, isDirect = true),
                 )
             }
         )

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt

@@ -72,6 +72,7 @@ import io.element.android.libraries.matrix.api.room.MatrixRoom
 import io.element.android.libraries.matrix.api.room.MatrixRoomInfo
 import io.element.android.libraries.matrix.api.room.MatrixRoomMembersState
 import io.element.android.libraries.matrix.api.room.MessageEventType
+import io.element.android.libraries.matrix.api.room.isDm
 import io.element.android.libraries.matrix.ui.messages.reply.map
 import io.element.android.libraries.matrix.ui.model.getAvatarData
 import io.element.android.libraries.matrix.ui.room.canCall
@@ -162,7 +163,7 @@ class MessagesPresenter @AssistedInject constructor(
         var showReinvitePrompt by remember { mutableStateOf(false) }
         LaunchedEffect(hasDismissedInviteDialog, composerState.textEditorState.hasFocus(), syncUpdateFlow.value) {
             withContext(dispatchers.io) {
-                showReinvitePrompt = !hasDismissedInviteDialog && composerState.textEditorState.hasFocus() && room.isDirect && room.activeMemberCount == 1L
+                showReinvitePrompt = !hasDismissedInviteDialog && composerState.textEditorState.hasFocus() && room.isDm && room.activeMemberCount == 1L
             }
         }
         val networkConnectionStatus by networkMonitor.connectivity.collectAsState()

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenter.kt

@@ -57,6 +57,7 @@ import io.element.android.libraries.matrix.api.room.MatrixRoom
 import io.element.android.libraries.matrix.api.room.Mention
 import io.element.android.libraries.matrix.api.room.draft.ComposerDraft
 import io.element.android.libraries.matrix.api.room.draft.ComposerDraftType
+import io.element.android.libraries.matrix.api.room.isDm
 import io.element.android.libraries.matrix.ui.messages.reply.InReplyToDetails
 import io.element.android.libraries.matrix.ui.messages.reply.map
 import io.element.android.libraries.mediapickers.api.PickerProvider

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt

@@ -42,6 +42,7 @@ import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.room.MatrixRoom
 import io.element.android.libraries.matrix.api.room.MessageEventType
+import io.element.android.libraries.matrix.api.room.isDm
 import io.element.android.libraries.matrix.api.room.roomMembers
 import io.element.android.libraries.matrix.api.timeline.ReceiptType
 import io.element.android.libraries.matrix.api.timeline.item.event.TimelineItemEventOrigin

features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/textcomposer/MessageComposerPresenterTest.kt

@@ -839,7 +839,6 @@ class MessageComposerPresenterTest {
         val david = aRoomMember(userId = A_USER_ID_4, displayName = "Dave", membership = RoomMembershipState.JOIN)
         val room = FakeMatrixRoom(
             isDirect = false,
-            isOneToOne = false,
         ).apply {
             givenRoomMembersState(
                 MatrixRoomMembersState.Ready(
@@ -904,7 +903,8 @@ class MessageComposerPresenterTest {
         val david = aRoomMember(userId = A_USER_ID_4, displayName = "Dave", membership = RoomMembershipState.JOIN)
         val room = FakeMatrixRoom(
             isDirect = true,
-            isOneToOne = true,
+            activeMemberCount = 2,
+            isEncrypted = true,
         ).apply {
             givenRoomMembersState(
                 MatrixRoomMembersState.Ready(

features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenter.kt

@@ -41,6 +41,7 @@ import io.element.android.libraries.matrix.api.room.MatrixRoom
 import io.element.android.libraries.matrix.api.room.MatrixRoomMembersState
 import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.StateEventType
+import io.element.android.libraries.matrix.api.room.isDm
 import io.element.android.libraries.matrix.api.room.powerlevels.canInvite
 import io.element.android.libraries.matrix.api.room.powerlevels.canSendState
 import io.element.android.libraries.matrix.api.room.roomNotificationSettings

features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/moderation/DefaultRoomMembersModerationPresenter.kt

@@ -35,6 +35,7 @@ import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.room.MatrixRoom
 import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.RoomMembershipState
+import io.element.android.libraries.matrix.api.room.isDm
 import io.element.android.libraries.matrix.api.room.powerlevels.canBan
 import io.element.android.libraries.matrix.api.room.powerlevels.canKick
 import io.element.android.services.analytics.api.AnalyticsService
@@ -58,8 +59,7 @@ class DefaultRoomMembersModerationPresenter @Inject constructor(
     private suspend fun canKick() = room.canKick().getOrDefault(false)
 
     override suspend fun canDisplayModerationActions(): Boolean {
-        val isDm = room.isDm && room.isEncrypted
+        return !room.isDm && (canBan() || canKick())
-        return !isDm && (canBan() || canKick())
     }
 
     @Composable

features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/members/moderation/DefaultRoomMembersModerationPresenterTest.kt

@@ -45,7 +45,7 @@ import org.junit.Test
 class DefaultRoomMembersModerationPresenterTest {
     @Test
     fun `canDisplayModerationActions - when room is DM is false`() = runTest {
-        val room = FakeMatrixRoom(isDirect = true, isPublic = true, isOneToOne = true).apply {
+        val room = FakeMatrixRoom(isDirect = true, isPublic = true, activeMemberCount = 2).apply {
             givenRoomInfo(aRoomInfo(isDirect = true, isPublic = false, activeMembersCount = 2))
         }
         val presenter = createDefaultRoomMembersModerationPresenter(matrixRoom = room)
@@ -54,7 +54,7 @@ class DefaultRoomMembersModerationPresenterTest {
 
     @Test
     fun `canDisplayModerationActions - when user can kick other users, FF is enabled and room is not a DM returns true`() = runTest {
-        val room = FakeMatrixRoom(isDirect = false, isOneToOne = false).apply {
+        val room = FakeMatrixRoom(isDirect = false, activeMemberCount = 10).apply {
             givenCanKickResult(Result.success(true))
         }
         val presenter = createDefaultRoomMembersModerationPresenter(matrixRoom = room)
@@ -63,7 +63,7 @@ class DefaultRoomMembersModerationPresenterTest {
 
     @Test
     fun `canDisplayModerationActions - when user can ban other users, FF is enabled and room is not a DM returns true`() = runTest {
-        val room = FakeMatrixRoom(isDirect = false, isOneToOne = false).apply {
+        val room = FakeMatrixRoom(isDirect = false, activeMemberCount = 10).apply {
             givenCanBanResult(Result.success(true))
         }
         val presenter = createDefaultRoomMembersModerationPresenter(matrixRoom = room)

features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListPresenter.kt

@@ -290,5 +290,5 @@ internal fun RoomListRoomSummary.toInviteData() = InviteData(
     roomId = roomId,
     // Note: `name` should not be null at this point, but just in case, fallback to the roomId
     roomName = name ?: roomId.value,
-    isDirect = isDirect,
+    isDm = isDm,
 )

features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomSummaryRow.kt

@@ -95,8 +95,8 @@ internal fun RoomSummaryRow(
                 modifier = modifier
             ) {
                 InviteNameAndIndicatorRow(name = room.name)
-                InviteSubtitle(isDirect = room.isDirect, inviteSender = room.inviteSender, canonicalAlias = room.canonicalAlias)
+                InviteSubtitle(isDm = room.isDm, inviteSender = room.inviteSender, canonicalAlias = room.canonicalAlias)
-                if (!room.isDirect && room.inviteSender != null) {
+                if (!room.isDm && room.inviteSender != null) {
                     Spacer(modifier = Modifier.height(4.dp))
                     InviteSenderView(
                         modifier = Modifier.fillMaxWidth(),
@@ -206,12 +206,12 @@ private fun NameAndTimestampRow(
 
 @Composable
 private fun InviteSubtitle(
-    isDirect: Boolean,
+    isDm: Boolean,
     inviteSender: InviteSender?,
     canonicalAlias: RoomAlias?,
     modifier: Modifier = Modifier
 ) {
-    val subtitle = if (isDirect) {
+    val subtitle = if (isDm) {
         inviteSender?.userId?.value
     } else {
         canonicalAlias?.value

features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/datasource/RoomListRoomSummaryFactory.kt

@@ -45,7 +45,7 @@ class RoomListRoomSummaryFactory @Inject constructor(
             isMarkedUnread = details.isMarkedUnread,
             timestamp = lastMessageTimestampFormatter.format(details.lastMessageTimestamp),
             lastMessage = details.lastMessage?.let { message ->
-                roomLastMessageFormatter.format(message.event, details.isDirect)
+                roomLastMessageFormatter.format(message.event, details.isDm)
             }.orEmpty(),
             avatarData = avatarData,
             userDefinedNotificationMode = details.userDefinedNotificationMode,

features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/model/RoomListRoomSummaryProvider.kt

@@ -101,7 +101,7 @@ open class RoomListRoomSummaryProvider : PreviewParameterProvider<RoomListRoomSu
                         userId = UserId("@bob:matrix.org"),
                         displayName = "Bob",
                     ),
-                    isDirect = true,
+                    isDm = true,
                 ),
                 aRoomListRoomSummary(
                     name = null,

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/notification/NotificationData.kt

@@ -33,6 +33,7 @@ data class NotificationData(
     val roomAvatarUrl: String?,
     val roomDisplayName: String?,
     val isDirect: Boolean,
+    val isDm: Boolean,
     val isEncrypted: Boolean,
     val isNoisy: Boolean,
     val timestamp: Long,

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoom.kt

@@ -57,9 +57,6 @@ interface MatrixRoom : Closeable {
     val activeMemberCount: Long
     val joinedMemberCount: Long
 
-    /** Whether the room is a direct message. */
-    val isDm: Boolean get() = isDirect && isOneToOne
-
     val roomInfoFlow: Flow<MatrixRoomInfo>
     val roomTypingMembersFlow: Flow<List<UserId>>
 

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomIsDmCheck.kt

@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2024 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.libraries.matrix.api.room
+
+/**
+ * Returns whether the room with the provided info is a DM.
+ * A DM is a room with at most 2 active members (one of them may have left).
+ *
+ * @param isDirect true if the room is direct
+ * @param activeMembersCount the number of active members in the room (joined or invited)
+ */
+fun isDm(isDirect: Boolean, activeMembersCount: Int): Boolean {
+    return isDirect && activeMembersCount <= 2
+}
+
+/**
+ * Returns whether the [MatrixRoom] is a DM.
+ */
+val MatrixRoom.isDm get() = isDm(isDirect, activeMemberCount.toInt())
+
+/**
+ * Returns whether the [MatrixRoomInfo] is from a DM.
+ */
+val MatrixRoomInfo.isDm get() = isDm(isDirect, activeMembersCount.toInt())

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/recent/RecentDirectRoom.kt

@@ -21,6 +21,7 @@ import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.room.CurrentUserMembership
 import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.isDm
 import io.element.android.libraries.matrix.api.room.toMatrixUser
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import kotlinx.coroutines.flow.first

libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/room/RoomIsDmCheckTest.kt

@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2024 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.libraries.matrix.api.room
+
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+
+class RoomIsDmCheckTest {
+    @Test
+    fun `a room is a DM only if it has at most 2 members and is direct`() {
+        val isDirect = true
+        val activeMembersCount = 2
+
+        val isDm = isDm(isDirect, activeMembersCount)
+
+        assertThat(isDm).isTrue()
+    }
+
+    @Test
+    fun `a room can be a DM if it has also a single active user`() {
+        val isDirect = true
+        val activeMembersCount = 1
+
+        val isDm = isDm(isDirect, activeMembersCount)
+
+        assertThat(isDm).isTrue()
+    }
+
+    @Test
+    fun `a room is not a DM if it's not direct`() {
+        val isDirect = false
+        val activeMembersCount = 2
+
+        val isDm = isDm(isDirect, activeMembersCount)
+
+        assertThat(isDm).isFalse()
+    }
+
+    @Test
+    fun `a room is not a DM if it has more than 2 active users`() {
+        val isDirect = true
+        val activeMembersCount = 3
+
+        val isDm = isDm(isDirect, activeMembersCount)
+
+        assertThat(isDm).isFalse()
+    }
+}

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notification/NotificationMapper.kt

@@ -23,6 +23,7 @@ import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.api.notification.NotificationContent
 import io.element.android.libraries.matrix.api.notification.NotificationData
 import io.element.android.libraries.matrix.api.room.RoomMembershipState
+import io.element.android.libraries.matrix.api.room.isDm
 import io.element.android.services.toolbox.api.systemclock.SystemClock
 import org.matrix.rustcomponents.sdk.NotificationEvent
 import org.matrix.rustcomponents.sdk.NotificationItem
@@ -40,15 +41,20 @@ class NotificationMapper(
         notificationItem: NotificationItem
     ): NotificationData {
         return notificationItem.use { item ->
+            val isDm = isDm(
+                isDirect = item.roomInfo.isDirect,
+                activeMembersCount = item.roomInfo.joinedMembersCount.toInt(),
+            )
             NotificationData(
                 eventId = eventId,
                 roomId = roomId,
                 senderAvatarUrl = item.senderInfo.avatarUrl,
                 senderDisplayName = item.senderInfo.displayName,
                 senderIsNameAmbiguous = item.senderInfo.isNameAmbiguous,
-                roomAvatarUrl = item.roomInfo.avatarUrl ?: item.senderInfo.avatarUrl.takeIf { item.roomInfo.isDirect },
+                roomAvatarUrl = item.roomInfo.avatarUrl ?: item.senderInfo.avatarUrl.takeIf { isDm },
                 roomDisplayName = item.roomInfo.displayName,
                 isDirect = item.roomInfo.isDirect,
+                isDm = isDm,
                 isEncrypted = item.roomInfo.isEncrypted.orFalse(),
                 isNoisy = item.isNoisy.orFalse(),
                 timestamp = item.timestamp() ?: clock.epochMillis(),

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListFilter.kt

@@ -26,10 +26,10 @@ val RoomListFilter.predicate
         is RoomListFilter.Any -> { _: RoomSummary -> true }
         RoomListFilter.None -> { _: RoomSummary -> false }
         RoomListFilter.Category.Group -> { roomSummary: RoomSummary ->
-            !roomSummary.isDirect && !roomSummary.isInvited()
+            !roomSummary.isDm && !roomSummary.isInvited()
         }
         RoomListFilter.Category.People -> { roomSummary: RoomSummary ->
-            roomSummary.isDirect && !roomSummary.isInvited()
+            roomSummary.isDm && !roomSummary.isInvited()
         }
         RoomListFilter.Favorite -> { roomSummary: RoomSummary ->
             roomSummary.isFavorite && !roomSummary.isInvited()

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryDetailsFactory.kt

@@ -18,6 +18,7 @@ package io.element.android.libraries.matrix.impl.roomlist
 
 import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.room.isDm
 import io.element.android.libraries.matrix.api.roomlist.RoomSummary
 import io.element.android.libraries.matrix.impl.notificationsettings.RoomNotificationSettingsMapper
 import io.element.android.libraries.matrix.impl.room.elementHeroes
@@ -47,7 +48,7 @@ class RoomSummaryDetailsFactory(private val roomMessageFactory: RoomMessageFacto
             inviter = roomInfo.inviter?.let(RoomMemberMapper::map),
             userDefinedNotificationMode = roomInfo.userDefinedNotificationMode?.let(RoomNotificationSettingsMapper::mapMode),
             hasRoomCall = roomInfo.hasRoomCall,
-            isDm = roomInfo.isDirect && roomInfo.activeMembersCount.toLong() == 2L,
+            isDm = isDm(isDirect = roomInfo.isDirect, activeMembersCount = roomInfo.activeMembersCount.toInt()),
             isFavorite = roomInfo.isFavourite,
             currentUserMembership = roomInfo.membership.map(),
             heroes = roomInfo.elementHeroes(),

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimeline.kt

@@ -28,6 +28,7 @@ import io.element.android.libraries.matrix.api.media.VideoInfo
 import io.element.android.libraries.matrix.api.poll.PollKind
 import io.element.android.libraries.matrix.api.room.MatrixRoom
 import io.element.android.libraries.matrix.api.room.Mention
+import io.element.android.libraries.matrix.api.room.isDm
 import io.element.android.libraries.matrix.api.room.location.AssetType
 import io.element.android.libraries.matrix.api.timeline.MatrixTimelineItem
 import io.element.android.libraries.matrix.api.timeline.ReceiptType

libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListFilterTest.kt

@@ -25,10 +25,10 @@ import org.junit.Test
 
 class RoomListFilterTest {
     private val regularRoom = aRoomSummary(
-        isDirect = false
+        isDm = false
     )
-    private val directRoom = aRoomSummary(
+    private val dmRoom = aRoomSummary(
-        isDirect = true
+        isDm = true
     )
     private val favoriteRoom = aRoomSummary(
         isFavorite = true
@@ -48,7 +48,7 @@ class RoomListFilterTest {
 
     private val roomSummaries = listOf(
         regularRoom,
-        directRoom,
+        dmRoom,
         favoriteRoom,
         markedAsUnreadRoom,
         unreadNotificationRoom,
@@ -71,7 +71,7 @@ class RoomListFilterTest {
     @Test
     fun `Room list filter people`() = runTest {
         val filter = RoomListFilter.Category.People
-        assertThat(roomSummaries.filter(filter)).containsExactly(directRoom)
+        assertThat(roomSummaries.filter(filter)).containsExactly(dmRoom)
     }
 
     @Test

libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/notification/NotificationData.kt

@@ -34,6 +34,7 @@ fun aNotificationData(
         roomAvatarUrl = null,
         roomDisplayName = null,
         isDirect = false,
+        isDm = false,
         isEncrypted = false,
         isNoisy = false,
         timestamp = 0L,

libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeMatrixRoom.kt

@@ -80,7 +80,6 @@ class FakeMatrixRoom(
     override val isPublic: Boolean = true,
     override val isSpace: Boolean = false,
     override val isDirect: Boolean = false,
-    override val isOneToOne: Boolean = false,
     override val joinedMemberCount: Long = 123L,
     override val activeMemberCount: Long = 234L,
     val notificationSettingsService: NotificationSettingsService = FakeNotificationSettingsService(),

libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/CallNotificationEventResolver.kt

@@ -79,7 +79,7 @@ class DefaultCallNotificationEventResolver @Inject constructor(
                     senderDisambiguatedDisplayName = getDisambiguatedDisplayName(content.senderId),
                     body = "☎️ ${stringProvider.getString(R.string.notification_incoming_call)}",
                     roomName = roomDisplayName,
-                    roomIsDirect = isDirect,
+                    roomIsDm = isDm,
                     roomAvatarPath = roomAvatarUrl,
                     senderAvatarPath = senderAvatarUrl,
                     type = EventType.CALL_NOTIFY,

libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotifiableEventResolver.kt

@@ -120,7 +120,7 @@ class DefaultNotifiableEventResolver @Inject constructor(
                     body = notificationBody,
                     imageUriString = fetchImageIfPresent(client)?.toString(),
                     roomName = roomDisplayName,
-                    roomIsDirect = isDirect,
+                    roomIsDm = isDm,
                     roomAvatarPath = roomAvatarUrl,
                     senderAvatarPath = senderAvatarUrl,
                 )
@@ -168,7 +168,7 @@ class DefaultNotifiableEventResolver @Inject constructor(
                     body = stringProvider.getString(CommonStrings.common_call_invite),
                     imageUriString = fetchImageIfPresent(client)?.toString(),
                     roomName = roomDisplayName,
-                    roomIsDirect = isDirect,
+                    roomIsDm = isDm,
                     roomAvatarPath = roomAvatarUrl,
                     senderAvatarPath = senderAvatarUrl,
                 )
@@ -197,7 +197,7 @@ class DefaultNotifiableEventResolver @Inject constructor(
                     body = stringProvider.getString(CommonStrings.common_poll_summary, content.question),
                     imageUriString = null,
                     roomName = roomDisplayName,
-                    roomIsDirect = isDirect,
+                    roomIsDm = isDm,
                     roomAvatarPath = roomAvatarUrl,
                     senderAvatarPath = senderAvatarUrl,
                 )
@@ -330,7 +330,7 @@ internal fun buildNotifiableMessageEvent(
     imageUriString: String? = null,
     threadId: ThreadId? = null,
     roomName: String? = null,
-    roomIsDirect: Boolean = false,
+    roomIsDm: Boolean = false,
     roomAvatarPath: String? = null,
     senderAvatarPath: String? = null,
     soundName: String? = null,
@@ -354,7 +354,7 @@ internal fun buildNotifiableMessageEvent(
     imageUriString = imageUriString,
     threadId = threadId,
     roomName = roomName,
-    roomIsDirect = roomIsDirect,
+    roomIsDm = roomIsDm,
     roomAvatarPath = roomAvatarPath,
     senderAvatarPath = senderAvatarPath,
     soundName = soundName,

libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationBroadcastReceiverHandler.kt

@@ -25,6 +25,7 @@ import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.api.core.ThreadId
 import io.element.android.libraries.matrix.api.core.asEventId
 import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.isDm
 import io.element.android.libraries.matrix.api.timeline.ReceiptType
 import io.element.android.libraries.preferences.api.store.SessionPreferencesStoreFactory
 import io.element.android.libraries.push.api.notifications.NotificationDrawerManager
@@ -160,7 +161,7 @@ class NotificationBroadcastReceiverHandler @Inject constructor(
             imageUriString = null,
             threadId = threadId,
             roomName = room.displayName,
-            roomIsDirect = room.isDirect,
+            roomIsDm = room.isDm,
             outGoingMessage = true,
         )
         onNotifiableEventReceived.onNotifiableEventReceived(notifiableMessageEvent)

libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationDataFactory.kt

@@ -79,7 +79,7 @@ class DefaultNotificationDataFactory @Inject constructor(
             .groupBy { it.roomId }
         return messagesToDisplay.map { (roomId, events) ->
             val roomName = events.lastOrNull()?.roomName ?: roomId.value
-            val isDirect = events.lastOrNull()?.roomIsDirect ?: false
+            val isDm = events.lastOrNull()?.roomIsDm ?: false
             val notification = roomGroupMessageCreator.createRoomMessage(
                 currentUser = currentUser,
                 events = events,
@@ -90,7 +90,7 @@ class DefaultNotificationDataFactory @Inject constructor(
             RoomNotification(
                 notification = notification,
                 roomId = roomId,
-                summaryLine = createRoomMessagesGroupSummaryLine(events, roomName, isDirect),
+                summaryLine = createRoomMessagesGroupSummaryLine(events, roomName, isDm),
                 messageCount = events.size,
                 latestTimestamp = events.maxOf { it.timestamp },
                 shouldBing = events.any { it.noisy }
@@ -167,9 +167,9 @@ class DefaultNotificationDataFactory @Inject constructor(
         }
     }
 
-    private fun createRoomMessagesGroupSummaryLine(events: List<NotifiableMessageEvent>, roomName: String, roomIsDirect: Boolean): CharSequence {
+    private fun createRoomMessagesGroupSummaryLine(events: List<NotifiableMessageEvent>, roomName: String, roomIsDm: Boolean): CharSequence {
         return when (events.size) {
-            1 -> createFirstMessageSummaryLine(events.first(), roomName, roomIsDirect)
+            1 -> createFirstMessageSummaryLine(events.first(), roomName, roomIsDm)
             else -> {
                 stringProvider.getQuantityString(
                     R.plurals.notification_compat_summary_line_for_room,
@@ -181,8 +181,8 @@ class DefaultNotificationDataFactory @Inject constructor(
         }
     }
 
-    private fun createFirstMessageSummaryLine(event: NotifiableMessageEvent, roomName: String, roomIsDirect: Boolean): CharSequence {
+    private fun createFirstMessageSummaryLine(event: NotifiableMessageEvent, roomName: String, roomIsDm: Boolean): CharSequence {
-        return if (roomIsDirect) {
+        return if (roomIsDm) {
             buildSpannedString {
                 event.senderDisambiguatedDisplayName?.let {
                     inSpans(StyleSpan(Typeface.BOLD)) {

libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/RoomEventGroupInfo.kt

@@ -26,7 +26,7 @@ data class RoomEventGroupInfo(
     val sessionId: SessionId,
     val roomId: RoomId,
     val roomDisplayName: String,
-    val isDirect: Boolean = false,
+    val isDm: Boolean = false,
     // An event in the list has not yet been display
     val hasNewEvent: Boolean = false,
     // true if at least one on the not yet displayed event is noisy

libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/RoomGroupMessageCreator.kt

@@ -56,7 +56,7 @@ class DefaultRoomGroupMessageCreator @Inject constructor(
     ): Notification {
         val lastKnownRoomEvent = events.last()
         val roomName = lastKnownRoomEvent.roomName ?: lastKnownRoomEvent.senderDisambiguatedDisplayName ?: "Room name (${roomId.value.take(8)}…)"
-        val roomIsGroup = !lastKnownRoomEvent.roomIsDirect
+        val roomIsGroup = !lastKnownRoomEvent.roomIsDm
 
         val tickerText = if (roomIsGroup) {
             stringProvider.getString(R.string.notification_ticker_text_group, roomName, events.last().senderDisambiguatedDisplayName, events.last().description)
@@ -68,12 +68,13 @@ class DefaultRoomGroupMessageCreator @Inject constructor(
 
         val lastMessageTimestamp = events.last().timestamp
         val smartReplyErrors = events.filter { it.isSmartReplyError() }
+        val roomIsDm = !roomIsGroup
         return notificationCreator.createMessagesListNotification(
                 RoomEventGroupInfo(
                     sessionId = currentUser.userId,
                     roomId = roomId,
                     roomDisplayName = roomName,
-                    isDirect = !roomIsGroup,
+                    isDm = roomIsDm,
                     hasSmartReplyError = smartReplyErrors.isNotEmpty(),
                     shouldBing = events.any { it.noisy },
                     customSound = events.last().soundName,

libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/NotificationCreator.kt

@@ -157,7 +157,7 @@ class DefaultNotificationCreator @Inject constructor(
 
         val messagingStyle = existingNotification?.let {
             MessagingStyle.extractMessagingStyleFromNotification(it)
-        } ?: messagingStyleFromCurrentUser(roomInfo.sessionId, currentUser, imageLoader, roomInfo.roomDisplayName, !roomInfo.isDirect)
+        } ?: messagingStyleFromCurrentUser(roomInfo.sessionId, currentUser, imageLoader, roomInfo.roomDisplayName, !roomInfo.isDm)
 
         messagingStyle.addMessagesFromEvents(events, imageLoader)
 

libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/model/NotifiableMessageEvent.kt

@@ -43,7 +43,7 @@ data class NotifiableMessageEvent(
     val imageUriString: String?,
     val threadId: ThreadId?,
     val roomName: String?,
-    val roomIsDirect: Boolean = false,
+    val roomIsDm: Boolean = false,
     val roomAvatarPath: String? = null,
     val senderAvatarPath: String? = null,
     val soundName: String? = null,

libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotifiableEventResolverTest.kt

@@ -473,7 +473,6 @@ class DefaultNotifiableEventResolverTest {
             imageUriString = null,
             threadId = null,
             roomName = null,
-            roomIsDirect = false,
             roomAvatarPath = null,
             senderAvatarPath = null,
             soundName = null,
@@ -544,7 +543,6 @@ class DefaultNotifiableEventResolverTest {
             roomId = A_ROOM_ID,
             threadId = null,
             roomName = null,
-            roomIsDirect = false,
             canBeReplaced = false,
             isRedacted = false,
             imageUriString = null,
@@ -578,7 +576,6 @@ class DefaultNotifiableEventResolverTest {
             roomId = A_ROOM_ID,
             threadId = null,
             roomName = null,
-            roomIsDirect = false,
             canBeReplaced = false,
             isRedacted = false,
             imageUriString = null,
@@ -686,6 +683,7 @@ class DefaultNotifiableEventResolverTest {
             timestamp = timestamp,
             content = content,
             hasMention = hasMention,
+            isDm = false,
         )
     }
 
@@ -704,7 +702,6 @@ class DefaultNotifiableEventResolverTest {
             imageUriString = null,
             threadId = null,
             roomName = null,
-            roomIsDirect = false,
             roomAvatarPath = null,
             senderAvatarPath = null,
             soundName = null,

libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultRoomGroupMessageCreatorTest.kt

@@ -188,14 +188,14 @@ class DefaultRoomGroupMessageCreatorTest {
     }
 
     @Test
-    fun `test createRoomMessage for direct room`() = runTest {
+    fun `test createRoomMessage for DM`() = runTest {
         val sut = createRoomGroupMessageCreator()
         val fakeImageLoader = FakeImageLoader()
         val result = sut.createRoomMessage(
             currentUser = aMatrixUser(),
             events = listOf(
                 aNotifiableMessageEvent(timestamp = A_TIMESTAMP).copy(
-                    roomIsDirect = true,
+                    roomIsDm = true,
                 ),
             ),
             roomId = A_ROOM_ID,

libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/factories/DefaultNotificationCreatorTest.kt

@@ -227,7 +227,6 @@ class DefaultNotificationCreatorTest {
                 sessionId = A_SESSION_ID,
                 roomId = A_ROOM_ID,
                 roomDisplayName = "roomDisplayName",
-                isDirect = false,
                 hasSmartReplyError = false,
                 shouldBing = false,
                 customSound = null,
@@ -254,7 +253,6 @@ class DefaultNotificationCreatorTest {
                 sessionId = A_SESSION_ID,
                 roomId = A_ROOM_ID,
                 roomDisplayName = "roomDisplayName",
-                isDirect = false,
                 hasSmartReplyError = false,
                 shouldBing = true,
                 customSound = null,

libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fixtures/NotifiableEventFixture.kt

@@ -97,7 +97,6 @@ fun aNotifiableMessageEvent(
     roomId = roomId,
     threadId = threadId,
     roomName = "room-name",
-    roomIsDirect = false,
     canBeReplaced = false,
     isRedacted = isRedacted,
     imageUriString = null,

tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_10_en.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fd2b534a026cb2c96c90f20eb0154b20672d4eae294c558804898cd927e93585
+size 106258

tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_10_en.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:13ed33b9e0b040ac1052389728179014984dc765671384e2d7215377a19d8fcc
+size 91575