Unify the way we decide whether a room is a DM or a group room

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 !isDm && (canBan() || canKick())
+        return !room.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,
+    isDirect = 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)
-                if (!room.isDirect && room.inviteSender != null) {
+                InviteSubtitle(isDm = room.isDm, inviteSender = room.inviteSender, canonicalAlias = room.canonicalAlias)
+                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(
-        isDirect = true
+    private val dmRoom = aRoomSummary(
+        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