Adapt to new DM definition changes in the SDK (#6748)

* Set `DmRoomDefinition.TwoPeople` in `ClientBuilder`. This applies the 'direct and with at most 2 non-service members' rule to what the SDK should consider a DM.

* Map `RoomInfo.isDm` from the SDK

* Map `NotificationData.isDm` from `NotificationInfo.roomInfo.isDm`

* Remove `RoomIsDmCheck` file as its extension functions are now redundant. Move `Room.isDm` helper function to `BaseRoom`.

* Map `isDm` in `SpaceRoom` from the SDK too

* Replace `isDirect` with `isDm` where possible

* Map `RoomMember.isServiceMember` from the SDK and use it to tell apart normal members of a room from service members (i.e. `RoomMembersState.getDirectRoomMember`)

features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/DefaultCallWidgetProvider.kt

@@ -14,7 +14,6 @@ import io.element.android.libraries.core.extensions.runCatchingExceptions
 import io.element.android.libraries.matrix.api.MatrixClientProvider
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.SessionId
-import io.element.android.libraries.matrix.api.room.isDm
 import io.element.android.libraries.matrix.api.widget.CallWidgetSettingsProvider
 import io.element.android.libraries.preferences.api.store.AppPreferencesStore
 import io.element.android.services.appnavstate.api.ActiveRoomsHolder

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

@@ -19,7 +19,6 @@ import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.eventformatter.api.RoomLatestEventFormatter
 import io.element.android.libraries.matrix.api.room.CallIntentConsensus
 import io.element.android.libraries.matrix.api.room.CurrentUserMembership
-import io.element.android.libraries.matrix.api.room.isDm
 import io.element.android.libraries.matrix.api.roomlist.LatestEventValue
 import io.element.android.libraries.matrix.api.roomlist.RoomSummary
 import io.element.android.libraries.matrix.ui.model.getAvatarData

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

@@ -11,7 +11,6 @@ package io.element.android.features.invite.api
 import android.os.Parcelable
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.room.RoomInfo
-import io.element.android.libraries.matrix.api.room.isDm
 import io.element.android.libraries.matrix.api.room.preview.RoomPreviewInfo
 import io.element.android.libraries.matrix.api.spaces.SpaceRoom
 import kotlinx.parcelize.Parcelize

features/invitepeople/impl/src/test/kotlin/io/element/android/features/invitepeople/impl/DefaultInvitePeoplePresenterTest.kt

@@ -540,7 +540,7 @@ internal class DefaultInvitePeoplePresenterTest {
     }
 
     @Test
-    fun `present - suggestions are loaded from recent direct rooms`() = runTest {
+    fun `present - suggestions are loaded from recent DM rooms`() = runTest {
         val dmRoomId = RoomId("!dm_room:server.org")
         val otherUserId = UserId("@frank:server.org")
         val matrixClient = FakeMatrixClient(sessionId = A_USER_ID).apply {
@@ -554,7 +554,7 @@ internal class DefaultInvitePeoplePresenterTest {
                     roomId = dmRoomId,
                     initialRoomInfo = aRoomInfo(
                         id = dmRoomId,
-                        isDirect = true,
+                        isDm = true,
                         activeMembersCount = 2,
                         currentUserMembership = CurrentUserMembership.JOINED,
                     ),
@@ -591,7 +591,7 @@ internal class DefaultInvitePeoplePresenterTest {
                     roomId = dmRoomId,
                     initialRoomInfo = aRoomInfo(
                         id = dmRoomId,
-                        isDirect = true,
+                        isDm = true,
                         activeMembersCount = 2,
                         currentUserMembership = CurrentUserMembership.JOINED,
                     ),

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

@@ -44,7 +44,6 @@ import io.element.android.libraries.matrix.api.room.CurrentUserMembership
 import io.element.android.libraries.matrix.api.room.RoomInfo
 import io.element.android.libraries.matrix.api.room.RoomMembershipDetails
 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.join.JoinRule
 import io.element.android.libraries.matrix.api.room.preview.RoomPreviewInfo

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

@@ -24,7 +24,6 @@ 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.BaseRoom
 import io.element.android.libraries.matrix.api.room.RoomMember
-import io.element.android.libraries.matrix.api.room.isDm
 import io.element.android.libraries.matrix.api.room.powerlevels.usersWithRole
 import io.element.android.libraries.push.api.notifications.conversations.NotificationConversationService
 import kotlinx.coroutines.CoroutineScope

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

@@ -115,7 +115,7 @@ class LeaveBaseRoomPresenterTest {
                 givenGetRoomResult(
                     roomId = A_ROOM_ID,
                     result = FakeBaseRoom().apply {
-                        givenRoomInfo(aRoomInfo(isDirect = true, activeMembersCount = 2))
+                        givenRoomInfo(aRoomInfo(isDm = true, activeMembersCount = 2))
                     },
                 )
             }

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

@@ -79,7 +79,6 @@ import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.room.RoomInfo
 import io.element.android.libraries.matrix.api.room.RoomMembersState
 import io.element.android.libraries.matrix.api.room.history.RoomHistoryVisibility
-import io.element.android.libraries.matrix.api.room.isDm
 import io.element.android.libraries.matrix.api.room.powerlevels.permissionsAsState
 import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.matrix.api.timeline.item.event.EventOrTransactionId

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

@@ -57,7 +57,6 @@ import io.element.android.libraries.matrix.api.room.JoinedRoom
 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.getDirectRoomMember
-import io.element.android.libraries.matrix.api.room.isDm
 import io.element.android.libraries.matrix.api.room.powerlevels.use
 import io.element.android.libraries.matrix.api.timeline.TimelineException
 import io.element.android.libraries.matrix.api.timeline.item.event.toEventOrTransactionId

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

@@ -190,6 +190,7 @@ internal fun SuggestionsPickerViewPreview() {
             isIgnored = false,
             role = RoomMember.Role.User,
             membershipChangeReason = null,
+            isServiceMember = false,
         )
         val anAlias = remember { RoomAlias("#room:domain.org") }
         SuggestionsPickerView(

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListPresenter.kt

@@ -44,7 +44,6 @@ import io.element.android.libraries.di.annotations.SessionCoroutineScope
 import io.element.android.libraries.featureflag.api.FeatureFlagService
 import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.matrix.api.room.JoinedRoom
-import io.element.android.libraries.matrix.api.room.isDm
 import io.element.android.libraries.matrix.api.room.powerlevels.permissionsAsState
 import io.element.android.libraries.matrix.api.room.roomMembers
 import io.element.android.libraries.ui.strings.CommonStrings

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

@@ -49,7 +49,6 @@ import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.UniqueId
 import io.element.android.libraries.matrix.api.core.asEventId
 import io.element.android.libraries.matrix.api.room.JoinedRoom
-import io.element.android.libraries.matrix.api.room.isDm
 import io.element.android.libraries.matrix.api.room.powerlevels.permissionsAsState
 import io.element.android.libraries.matrix.api.room.roomMembers
 import io.element.android.libraries.matrix.api.timeline.ReceiptType

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

@@ -598,7 +598,7 @@ class MessagesPresenterTest {
             baseRoom = FakeBaseRoom(
                 roomPermissions = roomPermissions(),
             ).apply {
-                givenRoomInfo(aRoomInfo(isDirect = true, joinedMembersCount = 1, activeMembersCount = 1))
+                givenRoomInfo(aRoomInfo(isDm = true, joinedMembersCount = 1, activeMembersCount = 1))
             },
             typingNoticeResult = { Result.success(Unit) },
         )
@@ -1112,7 +1112,7 @@ class MessagesPresenterTest {
                     canRedactOwn = true,
                     canPinUnpin = true,
                 ),
-                initialRoomInfo = aRoomInfo(isDirect = true, isEncrypted = true)
+                initialRoomInfo = aRoomInfo(isDm = true, isEncrypted = true)
             ).apply {
                 givenRoomMembersState(RoomMembersState.Ready(persistentListOf(aRoomMember(userId = A_SESSION_ID), aRoomMember(userId = A_USER_ID_2))))
             },

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

@@ -1066,7 +1066,7 @@ class MessageComposerPresenterTest {
             )
             givenRoomInfo(
                 aRoomInfo(
-                    isDirect = true,
+                    isDm = true,
                     activeMembersCount = 2,
                 )
             )

features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsPresenter.kt

@@ -223,7 +223,7 @@ class NotificationSettingsPresenter(
                 notificationSettingsService.setDefaultRoomNotificationMode(
                     isEncrypted = encryptedGroupDefaultMode != RoomNotificationMode.ALL_MESSAGES,
                     mode = RoomNotificationMode.ALL_MESSAGES,
-                    isOneToOne = false,
+                    isDM = false,
                 )
             }
 
@@ -234,7 +234,7 @@ class NotificationSettingsPresenter(
                 notificationSettingsService.setDefaultRoomNotificationMode(
                     isEncrypted = encryptedOneToOneDefaultMode != RoomNotificationMode.ALL_MESSAGES,
                     mode = RoomNotificationMode.ALL_MESSAGES,
-                    isOneToOne = true,
+                    isDM = true,
                 )
             }
         }.fold(

features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingNode.kt

@@ -34,12 +34,12 @@ class EditDefaultNotificationSettingNode(
     }
 
     data class Inputs(
-        val isOneToOne: Boolean
+        val isDm: Boolean
     ) : NodeInputs
 
     private val callback: Callback = callback()
     private val inputs = inputs<Inputs>()
-    private val presenter = presenterFactory.create(inputs.isOneToOne)
+    private val presenter = presenterFactory.create(inputs.isDm)
 
     @Composable
     override fun View(modifier: Modifier) {

features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingPresenter.kt

@@ -42,12 +42,12 @@ import kotlin.time.Duration.Companion.seconds
 @AssistedInject
 class EditDefaultNotificationSettingPresenter(
     private val notificationSettingsService: NotificationSettingsService,
-    @Assisted private val isOneToOne: Boolean,
+    @Assisted private val isDm: Boolean,
     private val roomListService: RoomListService,
 ) : Presenter<EditDefaultNotificationSettingState> {
     @AssistedFactory
     interface Factory {
-        fun create(isOneToOne: Boolean): EditDefaultNotificationSettingPresenter
+        fun create(isDm: Boolean): EditDefaultNotificationSettingPresenter
     }
 
     private val collator = Collator.getInstance().apply {
@@ -86,7 +86,7 @@ class EditDefaultNotificationSettingPresenter(
         }
 
         return EditDefaultNotificationSettingState(
-            isOneToOne = isOneToOne,
+            isOneToOne = isDm,
             mode = mode.value,
             roomsWithUserDefinedMode = roomsWithUserDefinedMode.value.toImmutableList(),
             changeNotificationSettingAction = changeNotificationSettingAction.value,
@@ -96,7 +96,7 @@ class EditDefaultNotificationSettingPresenter(
     }
 
     private fun CoroutineScope.fetchSettings(mode: MutableState<RoomNotificationMode?>) = launch {
-        mode.value = notificationSettingsService.getDefaultRoomNotificationMode(isEncrypted = true, isOneToOne = isOneToOne).getOrThrow()
+        mode.value = notificationSettingsService.getDefaultRoomNotificationMode(isEncrypted = true, isOneToOne = isDm).getOrThrow()
     }
 
     @OptIn(FlowPreview::class)
@@ -129,7 +129,7 @@ class EditDefaultNotificationSettingPresenter(
         val roomWithUserDefinedRules: Set<RoomId> = notificationSettingsService.getRoomsWithUserDefinedRules().getOrDefault(emptyList()).toSet()
         roomsWithUserDefinedMode.value = summaries
             .filter { roomSummary ->
-                roomWithUserDefinedRules.contains(roomSummary.roomId) && roomSummary.isOneToOne == isOneToOne
+                roomWithUserDefinedRules.contains(roomSummary.roomId) && roomSummary.isDm == isDm
             }
             .map { roomSummary ->
                 EditNotificationSettingRoomInfo(
@@ -154,9 +154,9 @@ class EditDefaultNotificationSettingPresenter(
     private fun CoroutineScope.setDefaultNotificationMode(mode: RoomNotificationMode, action: MutableState<AsyncAction<Unit>>) = launch {
         action.runUpdatingStateNoSuccess {
             // On modern clients, we don't have different settings for encrypted and non-encrypted rooms (Legacy clients did).
-            notificationSettingsService.setDefaultRoomNotificationMode(isEncrypted = true, mode = mode, isOneToOne = isOneToOne)
+            notificationSettingsService.setDefaultRoomNotificationMode(isEncrypted = true, mode = mode, isDM = isDm)
                 .map {
-                    notificationSettingsService.setDefaultRoomNotificationMode(isEncrypted = false, mode = mode, isOneToOne = isOneToOne)
+                    notificationSettingsService.setDefaultRoomNotificationMode(isEncrypted = false, mode = mode, isDM = isDm)
                 }
         }
     }

features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/notifications/EditDefaultNotificationSettingsPresenterTest.kt

@@ -198,7 +198,7 @@ class EditDefaultNotificationSettingsPresenterTest {
     ): EditDefaultNotificationSettingPresenter {
         return EditDefaultNotificationSettingPresenter(
             notificationSettingsService = notificationSettingsService,
-            isOneToOne = false,
+            isDm = false,
             roomListService = roomListService,
         )
     }

features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsPresenterTest.kt

@@ -61,8 +61,8 @@ class NotificationSettingsPresenterTest {
         val notificationSettingsService = FakeNotificationSettingsService()
         val presenter = createNotificationSettingsPresenter(notificationSettingsService)
         presenter.test {
-            notificationSettingsService.setDefaultRoomNotificationMode(isEncrypted = true, isOneToOne = false, mode = RoomNotificationMode.ALL_MESSAGES)
+            notificationSettingsService.setDefaultRoomNotificationMode(isEncrypted = true, isDM = false, mode = RoomNotificationMode.ALL_MESSAGES)
-            notificationSettingsService.setDefaultRoomNotificationMode(isEncrypted = false, isOneToOne = false, mode = RoomNotificationMode.ALL_MESSAGES)
+            notificationSettingsService.setDefaultRoomNotificationMode(isEncrypted = false, isDM = false, mode = RoomNotificationMode.ALL_MESSAGES)
             val updatedState = consumeItemsUntilPredicate {
                 (it.matrixSettings as? NotificationSettingsState.MatrixSettings.Valid)
                     ?.defaultGroupNotificationMode == RoomNotificationMode.ALL_MESSAGES
@@ -79,12 +79,12 @@ class NotificationSettingsPresenterTest {
         presenter.test {
             notificationSettingsService.setDefaultRoomNotificationMode(
                 isEncrypted = true,
-                isOneToOne = false,
+                isDM = false,
                 mode = RoomNotificationMode.ALL_MESSAGES
             )
             notificationSettingsService.setDefaultRoomNotificationMode(
                 isEncrypted = false,
-                isOneToOne = false,
+                isDM = false,
                 mode = RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY
             )
             val updatedState = consumeItemsUntilPredicate {

features/roomcall/impl/src/main/kotlin/io/element/android/features/roomcall/impl/RoomCallStatePresenter.kt

@@ -23,7 +23,6 @@ import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.matrix.api.notification.CallIntent
 import io.element.android.libraries.matrix.api.room.CallIntentConsensus
 import io.element.android.libraries.matrix.api.room.JoinedRoom
-import io.element.android.libraries.matrix.api.room.isDm
 import io.element.android.libraries.matrix.api.room.powerlevels.canCall
 import io.element.android.libraries.matrix.api.room.powerlevels.permissionsAsState
 

features/roomcall/impl/src/test/kotlin/io/element/android/features/roomcall/impl/RoomCallStatePresenterTest.kt

@@ -89,10 +89,10 @@ class RoomCallStatePresenterTest {
     }
 
     @Test
-    fun `present - initial state - when is direct room`() = runTest {
+    fun `present - initial state - when is DM room`() = runTest {
         val room = FakeJoinedRoom(
             baseRoom = FakeBaseRoom(
-                initialRoomInfo = aRoomInfo(isDirect = true),
+                initialRoomInfo = aRoomInfo(isDm = true),
                 roomPermissions = roomPermissions(true),
             )
         )

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

@@ -42,7 +42,6 @@ import io.element.android.libraries.matrix.api.encryption.identity.IdentityState
 import io.element.android.libraries.matrix.api.notificationsettings.NotificationSettingsService
 import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.room.RoomMember
-import io.element.android.libraries.matrix.api.room.isDm
 import io.element.android.libraries.matrix.api.room.join.JoinRule
 import io.element.android.libraries.matrix.api.room.powerlevels.canEditRolesAndPermissions
 import io.element.android.libraries.matrix.api.room.powerlevels.permissionsAsState
@@ -53,7 +52,6 @@ import io.element.android.libraries.preferences.api.store.AppPreferencesStore
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.services.analytics.api.AnalyticsService
 import io.element.android.services.analyticsproviders.api.trackers.captureInteraction
-import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
@@ -145,7 +143,7 @@ class RoomDetailsPresenter(
                 }
                 RoomDetailsEvent.UnmuteNotification -> {
                     scope.launch(dispatchers.io) {
-                        notificationSettingsService.unmuteRoom(room.roomId, isEncrypted, room.isOneToOne)
+                        notificationSettingsService.unmuteRoom(room.roomId, isEncrypted, room.isDm())
                     }
                 }
                 is RoomDetailsEvent.SetFavorite -> scope.setFavorite(event.isFavorite)
@@ -184,7 +182,7 @@ class RoomDetailsPresenter(
             isFavorite = isFavorite,
             displayRolesAndPermissionsSettings = !isDm && permissions.canEditRolesAndPermissions,
             isPublic = joinRule == JoinRule.Public,
-            heroes = roomInfo.heroes.toImmutableList(),
+            heroes = roomInfo.heroes,
             pinnedMessagesCount = pinnedMessagesCount,
             snackbarMessage = snackbarMessage,
             canShowKnockRequests = canShowKnockRequests,

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

@@ -74,6 +74,7 @@ fun aDmRoomMember(
     isIgnored: Boolean = false,
     role: RoomMember.Role = RoomMember.Role.User,
     membershipChangeReason: String? = null,
+    isServiceMember: Boolean = false,
 ) = RoomMember(
     userId = userId,
     displayName = displayName,
@@ -83,7 +84,8 @@ fun aDmRoomMember(
     powerLevel = powerLevel,
     isIgnored = isIgnored,
     role = role,
-    membershipChangeReason = membershipChangeReason
+    membershipChangeReason = membershipChangeReason,
+    isServiceMember = isServiceMember,
 )
 
 fun aRoomDetailsState(

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

@@ -128,6 +128,7 @@ fun aRoomMember(
     isIgnored: Boolean = false,
     role: RoomMember.Role = RoomMember.Role.User,
     membershipChangeReason: String? = null,
+    isServiceMember: Boolean = false,
 ) = RoomMember(
     userId = userId,
     displayName = displayName,
@@ -138,6 +139,7 @@ fun aRoomMember(
     isIgnored = isIgnored,
     role = role,
     membershipChangeReason = membershipChangeReason,
+    isServiceMember = isServiceMember,
 )
 
 fun aRoomMemberList() = persistentListOf(

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

@@ -160,7 +160,7 @@ class RoomNotificationSettingsPresenter(
         suspend {
             val isEncrypted = room.info().isEncrypted ?: room.getUpdatedIsEncrypted().getOrThrow()
             pendingModeState.value = null
-            notificationSettingsService.getRoomNotificationSettings(room.roomId, isEncrypted, room.isOneToOne).getOrThrow()
+            notificationSettingsService.getRoomNotificationSettings(room.roomId, isEncrypted, room.isDm()).getOrThrow()
         }.runCatchingUpdatingState(roomNotificationSettings)
     }
 
@@ -170,7 +170,7 @@ class RoomNotificationSettingsPresenter(
         val isEncrypted = room.info().isEncrypted ?: room.getUpdatedIsEncrypted().getOrThrow()
         defaultRoomNotificationMode.value = notificationSettingsService.getDefaultRoomNotificationMode(
             isEncrypted,
-            room.isOneToOne
+            room.isDm()
         ).getOrThrow()
     }
 

features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenterTest.kt

@@ -199,7 +199,7 @@ class RoomDetailsPresenterTest {
             givenRoomInfo(
                 aRoomInfo(
                     isEncrypted = true,
-                    isDirect = true,
+                    isDm = true,
                 )
             )
         }
@@ -284,7 +284,7 @@ class RoomDetailsPresenterTest {
             givenRoomInfo(
                 aRoomInfo(
                     isEncrypted = true,
-                    isDirect = true,
+                    isDm = true,
                 )
             )
         }
@@ -307,7 +307,6 @@ class RoomDetailsPresenterTest {
         val myRoomMember = aRoomMember(A_SESSION_ID)
         val otherRoomMember = aRoomMember(A_USER_ID_2)
         val room = aJoinedRoom(
-            isDirect = true,
             topic = null,
             roomPermissions = roomPermissions(),
             userDisplayNameResult = { Result.success(A_USER_NAME) },
@@ -325,7 +324,7 @@ class RoomDetailsPresenterTest {
 
             givenRoomInfo(
                 aRoomInfo(
-                    isDirect = true,
+                    isDm = true,
                     activeMembersCount = 2,
                     topic = null,
                 )

features/space/impl/src/main/kotlin/io/element/android/features/space/impl/addroom/AddRoomToSpaceSearchDataSource.kt

@@ -15,7 +15,6 @@ 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.CurrentUserMembership
 import io.element.android.libraries.matrix.api.room.RoomInfo
-import io.element.android.libraries.matrix.api.room.isDm
 import io.element.android.libraries.matrix.api.room.recent.getRecentlyVisitedRoomInfoFlow
 import io.element.android.libraries.matrix.api.roomlist.RoomList
 import io.element.android.libraries.matrix.api.roomlist.RoomListFilter

features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpacePresenter.kt

@@ -67,7 +67,7 @@ class LeaveSpacePresenter(
                 .orEmpty()
                 .partition { it.spaceRoom.roomId == leaveSpaceHandle.id }
             // By default select all rooms that can be left
-            val otherRoomsExcludingDm = otherRooms.filter { it.spaceRoom.isDirect != true }
+            val otherRoomsExcludingDm = otherRooms.filter { it.spaceRoom.isDm != true }
             selectedRoomIds = otherRoomsExcludingDm
                 .filter { it.isLastOwner.not() }
                 .map { it.spaceRoom.roomId }

features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceStateProvider.kt

@@ -109,6 +109,7 @@ private fun aSpaceInfo(
         avatarUrl = null,
         isPublic = true,
         isDirect = false,
+        isDm = false,
         isEncrypted = false,
         joinRule = joinRule,
         isSpace = true,

features/space/impl/src/test/kotlin/io/element/android/features/space/impl/leave/LeaveSpacePresenterTest.kt

@@ -98,13 +98,13 @@ class LeaveSpacePresenterTest {
                         listOf(
                             aLeaveSpaceRoom(spaceRoom = aSpace),
                             aLeaveSpaceRoom(
-                                spaceRoom = aSpaceRoom(roomId = A_ROOM_ID, isDirect = false)
+                                spaceRoom = aSpaceRoom(roomId = A_ROOM_ID, isDm = false)
                             ),
                             aLeaveSpaceRoom(
-                                spaceRoom = aSpaceRoom(roomId = A_ROOM_ID_2, isDirect = true)
+                                spaceRoom = aSpaceRoom(roomId = A_ROOM_ID_2, isDm = true)
                             ),
                             aLeaveSpaceRoom(
-                                spaceRoom = aSpaceRoom(roomId = A_ROOM_ID_3, isDirect = null)
+                                spaceRoom = aSpaceRoom(roomId = A_ROOM_ID_3, isDm = null)
                             ),
                         )
                     )

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/analytics/ViewRoomExt.kt

@@ -19,7 +19,7 @@ fun BaseRoom.toAnalyticsViewRoom(
     val activeSpace = selectedSpace?.toActiveSpace() ?: ViewRoom.ActiveSpace.Home
 
     return ViewRoom(
-        isDM = info().isDirect,
+        isDM = info().isDm,
         isSpace = info().isSpace,
         trigger = trigger,
         activeSpace = activeSpace,

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/notificationsettings/NotificationSettingsService.kt

@@ -21,7 +21,7 @@ interface NotificationSettingsService {
     val notificationSettingsChangeFlow: SharedFlow<Unit>
     suspend fun getRoomNotificationSettings(roomId: RoomId, isEncrypted: Boolean, isOneToOne: Boolean): Result<RoomNotificationSettings>
     suspend fun getDefaultRoomNotificationMode(isEncrypted: Boolean, isOneToOne: Boolean): Result<RoomNotificationMode>
-    suspend fun setDefaultRoomNotificationMode(isEncrypted: Boolean, mode: RoomNotificationMode, isOneToOne: Boolean): Result<Unit>
+    suspend fun setDefaultRoomNotificationMode(isEncrypted: Boolean, mode: RoomNotificationMode, isDM: Boolean): Result<Unit>
     suspend fun setRoomNotificationMode(roomId: RoomId, mode: RoomNotificationMode): Result<Unit>
     suspend fun restoreDefaultRoomNotificationMode(roomId: RoomId): Result<Unit>
     suspend fun muteRoom(roomId: RoomId): Result<Unit>

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

@@ -61,13 +61,12 @@ interface BaseRoom : Closeable {
      */
     fun info(): RoomInfo = roomInfoFlow.value
 
-    fun predecessorRoom(): PredecessorRoom?
-
     /**
-     * A one-to-one is a room with exactly 2 members.
+     * Returns whether the [BaseRoom] is a DM, with an updated state from the latest [RoomInfo].
-     * See [the Matrix spec](https://spec.matrix.org/latest/client-server-api/#default-underride-rules).
      */
-    val isOneToOne: Boolean get() = info().activeMembersCount == 2L
+    fun isDm() = roomInfoFlow.value.isDm
+
+    fun predecessorRoom(): PredecessorRoom?
 
     /**
      * Try to load the room members and update the membersFlow.

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

@@ -29,6 +29,7 @@ data class RoomInfo(
     val avatarUrl: String?,
     val isPublic: Boolean?,
     val isDirect: Boolean,
+    val isDm: Boolean,
     val isEncrypted: Boolean?,
     val joinRule: JoinRule?,
     val isSpace: Boolean,

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

@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2024, 2025 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.libraries.matrix.api.room
-
-import kotlinx.coroutines.flow.first
-
-/**
- * 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 [BaseRoom] is a DM, with an updated state from the latest [RoomInfo].
- */
-suspend fun BaseRoom.isDm() = roomInfoFlow.first().isDm
-
-/**
- * Returns whether the [RoomInfo] is from a DM.
- */
-val RoomInfo.isDm get() = isDm(isDirect, activeMembersCount.toInt())

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

@@ -22,6 +22,7 @@ data class RoomMember(
     val isIgnored: Boolean,
     val role: Role,
     val membershipChangeReason: String?,
+    val isServiceMember: Boolean,
 ) {
     /**
      * Role of the RoomMember, based on its [powerLevel].

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

@@ -40,5 +40,5 @@ fun RoomMembersState.activeRoomMembers(): List<RoomMember> {
 fun RoomMembersState.getDirectRoomMember(roomInfo: RoomInfo, sessionId: SessionId): RoomMember? {
     return roomMembers()
         ?.takeIf { roomInfo.isDm }
-        ?.find { it.userId != sessionId && it.membership.isActive() }
+        ?.find { !it.isServiceMember && it.userId != sessionId && it.membership.isActive() }
 }

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

@@ -12,7 +12,6 @@ import io.element.android.libraries.matrix.api.MatrixClient
 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.isDm
 import io.element.android.libraries.matrix.api.room.toMatrixUser
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import kotlinx.coroutines.flow.Flow

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/RoomSummary.kt

@@ -21,5 +21,5 @@ data class RoomSummary(
         is LatestEventValue.Remote -> latestEvent.timestamp
         is LatestEventValue.RoomInvite -> latestEvent.timestamp
     }
-    val isOneToOne get() = info.activeMembersCount == 2L
+    val isDm = info.isDm
 }

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/SpaceRoom.kt

@@ -38,6 +38,7 @@ data class SpaceRoom(
      */
     val via: ImmutableList<String>,
     val isDirect: Boolean?,
+    val isDm: Boolean?,
 ) {
     val isSpace = roomType == RoomType.Space
 

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

@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2024, 2025 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-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/RustMatrixClientFactory.kt

@@ -41,6 +41,7 @@ import org.matrix.rustcomponents.sdk.SlidingSyncVersion
 import org.matrix.rustcomponents.sdk.SlidingSyncVersionBuilder
 import org.matrix.rustcomponents.sdk.use
 import timber.log.Timber
+import uniffi.matrix_sdk_base.DmRoomDefinition
 import uniffi.matrix_sdk_base.MediaRetentionPolicy
 import uniffi.matrix_sdk_crypto.CollectStrategy
 import uniffi.matrix_sdk_crypto.DecryptionSettings
@@ -169,6 +170,7 @@ class RustMatrixClientFactory(
             )
             .enableShareHistoryOnInvite(true)
             .threadsEnabled(featureFlagService.isFeatureEnabled(FeatureFlags.Threads), threadSubscriptions = false)
+            .dmRoomDefinition(DmRoomDefinition.TWO_MEMBERS)
             .requestConfig(
                 RequestConfig(
                     timeout = 30_000uL,

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/analytics/JoinedRoomExt.kt

@@ -11,7 +11,6 @@ package io.element.android.libraries.matrix.impl.analytics
 import im.vector.app.features.analytics.plan.JoinedRoom
 import io.element.android.libraries.matrix.api.room.BaseRoom
 import io.element.android.libraries.matrix.api.room.RoomInfo
-import io.element.android.libraries.matrix.api.room.isDm
 import kotlinx.coroutines.flow.first
 
 private fun Long.toAnalyticsRoomSize(): JoinedRoom.RoomSize {

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

@@ -17,7 +17,6 @@ import io.element.android.libraries.matrix.api.core.ThreadId
 import io.element.android.libraries.matrix.api.core.UserId
 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.isDm
 import io.element.android.libraries.matrix.impl.room.join.map
 import io.element.android.services.toolbox.api.systemclock.SystemClock
 import org.matrix.rustcomponents.sdk.NotificationEvent
@@ -37,10 +36,6 @@ class NotificationMapper(
     ): Result<NotificationData> {
         return runCatchingExceptions {
             notificationItem.use { item ->
-                val isDm = isDm(
-                    isDirect = item.roomInfo.isDirect,
-                    activeMembersCount = item.roomInfo.joinedMembersCount.toInt(),
-                )
                 val timestamp = item.timestamp() ?: clock.epochMillis()
                 NotificationData(
                     sessionId = sessionId,
@@ -50,10 +45,10 @@ class NotificationMapper(
                     senderAvatarUrl = item.senderInfo.avatarUrl,
                     senderDisplayName = item.senderInfo.displayName,
                     senderIsNameAmbiguous = item.senderInfo.isNameAmbiguous,
-                    roomAvatarUrl = item.roomInfo.avatarUrl ?: item.senderInfo.avatarUrl.takeIf { isDm },
+                    roomAvatarUrl = item.roomInfo.avatarUrl ?: item.senderInfo.avatarUrl.takeIf { item.roomInfo.isDm },
                     roomDisplayName = item.roomInfo.displayName,
                     isDirect = item.roomInfo.isDirect,
-                    isDm = isDm,
+                    isDm = item.roomInfo.isDm,
                     isSpace = item.roomInfo.isSpace,
                     isEncrypted = item.roomInfo.isEncrypted.orFalse(),
                     isNoisy = item.isNoisy.orFalse(),

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notificationsettings/RustNotificationSettingsService.kt

@@ -62,11 +62,11 @@ class RustNotificationSettingsService(
     override suspend fun setDefaultRoomNotificationMode(
         isEncrypted: Boolean,
         mode: RoomNotificationMode,
-        isOneToOne: Boolean
+        isDM: Boolean
     ): Result<Unit> = withContext(dispatchers.io) {
         runCatchingExceptions {
             try {
-                notificationSettings.await().setDefaultRoomNotificationMode(isEncrypted, isOneToOne, mode.let(RoomNotificationSettingsMapper::mapMode))
+                notificationSettings.await().setDefaultRoomNotificationMode(isEncrypted, isDM, mode.let(RoomNotificationSettingsMapper::mapMode))
             } catch (exception: NotificationSettingsException.RuleNotFound) {
                 // `setDefaultRoomNotificationMode` updates multiple rules including unstable rules (e.g. the polls push rules defined in the MSC3930)
                 // since production home servers may not have these rules yet, we drop the RuleNotFound error

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/JoinedRustRoom.kt

@@ -348,7 +348,7 @@ class JoinedRustRoom(
         roomNotificationSettingsStateFlow.value = RoomNotificationSettingsState.Pending(prevRoomNotificationSettings = currentRoomNotificationSettings)
         runCatchingExceptions {
             val isEncrypted = roomInfoFlow.value.isEncrypted ?: getUpdatedIsEncrypted().getOrThrow()
-            notificationSettingsService.getRoomNotificationSettings(roomId, isEncrypted, isOneToOne).getOrThrow()
+            notificationSettingsService.getRoomNotificationSettings(roomId = roomId, isEncrypted = isEncrypted, isOneToOne = isDm()).getOrThrow()
         }.map {
             roomNotificationSettingsStateFlow.value = RoomNotificationSettingsState.Ready(it)
         }.onFailure {

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomInfoExt.kt

@@ -18,7 +18,7 @@ import org.matrix.rustcomponents.sdk.RoomInfo
  */
 fun RoomInfo.elementHeroes(): List<MatrixUser> {
     return heroes
-        .takeIf { isDirect && activeMembersCount.toLong() == 2L }
+        .takeIf { isDm }
         ?.takeIf { it.size == 1 }
         ?.map { it.map() }
         .orEmpty()

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomInfoMapper.kt

@@ -43,6 +43,7 @@ class RoomInfoMapper {
             avatarUrl = it.avatarUrl,
             isPublic = it.isPublic,
             isDirect = it.isDirect,
+            isDm = it.isDm,
             isEncrypted = when (it.encryptionState) {
                 EncryptionState.ENCRYPTED -> true
                 EncryptionState.NOT_ENCRYPTED -> false

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustBaseRoom.kt

@@ -23,7 +23,6 @@ import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.RoomMembersState
 import io.element.android.libraries.matrix.api.room.RoomMembershipObserver
 import io.element.android.libraries.matrix.api.room.draft.ComposerDraft
-import io.element.android.libraries.matrix.api.room.isDm
 import io.element.android.libraries.matrix.api.room.powerlevels.RoomPermissions
 import io.element.android.libraries.matrix.api.room.powerlevels.RoomPowerLevelsValues
 import io.element.android.libraries.matrix.api.room.tombstone.PredecessorRoom
@@ -119,7 +118,7 @@ class RustBaseRoom(
                 innerRoom.membersNoSync().use { members ->
                     members.nextChunk(members.len())
                         ?.map(RoomMemberMapper::map)
-                        ?.firstOrNull { roomMember -> roomMember.userId != sessionId && roomMember.membership.isActive() }
+                        ?.firstOrNull { roomMember -> !roomMember.isServiceMember && roomMember.userId != sessionId && roomMember.membership.isActive() }
                 }
             } else {
                 null

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/member/RoomMemberMapper.kt

@@ -28,7 +28,8 @@ object RoomMemberMapper {
             powerLevel = powerLevel,
             isIgnored = roomMember.isIgnored,
             role = mapRole(roomMember.suggestedRoleForPowerLevel, powerLevel),
-            membershipChangeReason = roomMember.membershipChangeReason
+            membershipChangeReason = roomMember.membershipChangeReason,
+            isServiceMember = roomMember.isServiceMember,
         )
     }
 

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/SpaceRoomMapper.kt

@@ -36,6 +36,7 @@ class SpaceRoomMapper {
             worldReadable = spaceRoom.worldReadable.orFalse(),
             via = spaceRoom.via.toImmutableList(),
             isDirect = spaceRoom.isDirect,
+            isDm = spaceRoom.isDm,
         )
     }
 }

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

@@ -20,7 +20,6 @@ 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.IntentionalMention
 import io.element.android.libraries.matrix.api.room.JoinedRoom
-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.MsgType

libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/analytics/JoinedExtKtTest.kt

@@ -43,6 +43,19 @@ class JoinedExtKtTest {
     @Test
     fun `test isDirect parameter mapping`() = runTest {
         assertThat(aRoom(isDirect = true).toAnalyticsJoinedRoom(null))
+            .isEqualTo(
+                JoinedRoom(
+                    isDM = false,
+                    isSpace = false,
+                    roomSize = JoinedRoom.RoomSize.One,
+                    trigger = null
+                )
+            )
+    }
+
+    @Test
+    fun `test isDm parameter mapping`() = runTest {
+        assertThat(aRoom(isDm = true).toAnalyticsJoinedRoom(null))
             .isEqualTo(
                 JoinedRoom(
                     isDM = true,
@@ -80,12 +93,13 @@ class JoinedExtKtTest {
     }
 
     private fun aRoom(
+        isDm: Boolean = false,
         isDirect: Boolean = false,
         isSpace: Boolean = false,
         joinedMemberCount: Long = 0
     ): FakeBaseRoom {
         return FakeBaseRoom().apply {
-            givenRoomInfo(aRoomInfo(isDirect = isDirect, isSpace = isSpace, joinedMembersCount = joinedMemberCount))
+            givenRoomInfo(aRoomInfo(isDm = isDm, isDirect = isDirect, isSpace = isSpace, joinedMembersCount = joinedMemberCount))
         }
     }
 }

libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/SpaceRoom.kt

@@ -50,5 +50,5 @@ internal fun aRustSpaceRoom(
     childrenCount = childrenCount,
     state = state,
     heroes = heroes,
-    via = emptyList()
+    via = emptyList(),
 )

libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiClientBuilder.kt

@@ -17,6 +17,7 @@ import org.matrix.rustcomponents.sdk.RequestConfig
 import org.matrix.rustcomponents.sdk.SlidingSyncVersionBuilder
 import org.matrix.rustcomponents.sdk.SqliteStoreBuilder
 import uniffi.matrix_sdk.BackupDownloadStrategy
+import uniffi.matrix_sdk_base.DmRoomDefinition
 import uniffi.matrix_sdk_crypto.CollectStrategy
 import uniffi.matrix_sdk_crypto.DecryptionSettings
 
@@ -47,5 +48,6 @@ class FakeFfiClientBuilder(
     override fun sqliteStore(config: SqliteStoreBuilder): ClientBuilder = this
     override fun inMemoryStore(): ClientBuilder = this
     override fun crossProcessLockConfig(crossProcessLockConfig: CrossProcessLockConfig): ClientBuilder = this
+    override fun dmRoomDefinition(dmRoomDefinition: DmRoomDefinition): ClientBuilder = this
     override suspend fun build() = buildResult()
 }

libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/RoomInfoExtTest.kt

@@ -20,8 +20,7 @@ class RoomInfoExtTest {
     @Test
     fun `get non empty element Heroes`() {
         val result = aRustRoomInfo(
-            isDirect = true,
+            isDm = true,
-            activeMembersCount = 2uL,
             heroes = listOf(aRustRoomHero())
         ).elementHeroes()
         assertThat(result).isEqualTo(
@@ -38,8 +37,7 @@ class RoomInfoExtTest {
     @Test
     fun `too many heroes and element Heroes is empty`() {
         val result = aRustRoomInfo(
-            isDirect = true,
+            isDm = true,
-            activeMembersCount = 2uL,
             heroes = listOf(aRustRoomHero(), aRustRoomHero())
         ).elementHeroes()
         assertThat(result).isEmpty()
@@ -48,18 +46,7 @@ class RoomInfoExtTest {
     @Test
     fun `not direct and element Heroes is empty`() {
         val result = aRustRoomInfo(
-            isDirect = false,
+            isDm = false,
-            activeMembersCount = 2uL,
-            heroes = listOf(aRustRoomHero())
-        ).elementHeroes()
-        assertThat(result).isEmpty()
-    }
-
-    @Test
-    fun `too many members and element Heroes is empty`() {
-        val result = aRustRoomInfo(
-            isDirect = true,
-            activeMembersCount = 3uL,
             heroes = listOf(aRustRoomHero())
         ).elementHeroes()
         assertThat(result).isEmpty()

libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/RoomInfoMapperTest.kt

@@ -86,6 +86,7 @@ class RoomInfoMapperTest {
                     privilegedCreatorsRole = true,
                     isLowPriority = true,
                     activeRoomCallConsensusIntent = RtcCallIntentConsensus.Full(RtcCallIntent.AUDIO),
+                    isDm = true,
                 )
             )
         ).isEqualTo(
@@ -136,6 +137,7 @@ class RoomInfoMapperTest {
                 privilegedCreatorRole = true,
                 isLowPriority = true,
                 activeCallIntentConsensus = CallIntentConsensus.Full(CallIntent.AUDIO),
+                isDm = true,
             )
         )
     }
@@ -181,6 +183,7 @@ class RoomInfoMapperTest {
                     privilegedCreatorsRole = true,
                     isLowPriority = true,
                     activeRoomCallConsensusIntent = RtcCallIntentConsensus.None,
+                    isDm = false,
                 )
             )
         ).isEqualTo(
@@ -225,6 +228,7 @@ class RoomInfoMapperTest {
                 privilegedCreatorRole = true,
                 isLowPriority = true,
                 activeCallIntentConsensus = CallIntentConsensus.None,
+                isDm = false,
             )
         )
     }

libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/notificationsettings/FakeNotificationSettingsService.kt

@@ -70,12 +70,12 @@ class FakeNotificationSettingsService(
         }
     }
 
-    override suspend fun setDefaultRoomNotificationMode(isEncrypted: Boolean, mode: RoomNotificationMode, isOneToOne: Boolean): Result<Unit> {
+    override suspend fun setDefaultRoomNotificationMode(isEncrypted: Boolean, mode: RoomNotificationMode, isDM: Boolean): Result<Unit> {
         val error = setDefaultNotificationModeError
         if (error != null) {
             return Result.failure(error)
         }
-        if (isOneToOne) {
+        if (isDM) {
             if (isEncrypted) {
                 defaultEncryptedOneToOneRoomNotificationMode = mode
             } else {

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

@@ -134,7 +134,11 @@ class FakeJoinedRoom(
     }
 
     override suspend fun updateRoomNotificationSettings(): Result<Unit> = simulateLongTask {
-        val notificationSettings = roomNotificationSettingsService.getRoomNotificationSettings(roomId, info().isEncrypted.orFalse(), isOneToOne).getOrThrow()
+        val notificationSettings = roomNotificationSettingsService.getRoomNotificationSettings(
+            roomId = roomId,
+            isEncrypted = info().isEncrypted.orFalse(),
+            isOneToOne = isDm(),
+        ).getOrThrow()
         (roomNotificationSettingsStateFlow as MutableStateFlow).value = RoomNotificationSettingsState.Ready(notificationSettings)
         return Result.success(Unit)
     }

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

@@ -71,6 +71,7 @@ fun aRoomInfo(
     privilegedCreatorRole: Boolean = false,
     isLowPriority: Boolean = false,
     activeCallIntentConsensus: CallIntentConsensus = CallIntentConsensus.None,
+    isDm: Boolean = false,
 ) = RoomInfo(
     id = id,
     name = name,
@@ -109,4 +110,5 @@ fun aRoomInfo(
     privilegedCreatorRole = privilegedCreatorRole,
     isLowPriority = isLowPriority,
     activeCallIntentConsensus = activeCallIntentConsensus,
+    isDm = isDm,
 )

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

@@ -23,6 +23,7 @@ fun aRoomMember(
     isIgnored: Boolean = false,
     role: RoomMember.Role = RoomMember.Role.User,
     membershipChangeReason: String? = null,
+    isServiceMember: Boolean = false,
 ) = RoomMember(
     userId = userId,
     displayName = displayName,
@@ -33,6 +34,7 @@ fun aRoomMember(
     isIgnored = isIgnored,
     role = role,
     membershipChangeReason = membershipChangeReason,
+    isServiceMember = isServiceMember,
 )
 
 fun aRoomMemberList() = persistentListOf(

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

@@ -120,6 +120,7 @@ fun aRoomSummary(
         privilegedCreatorRole = privilegedCreatorRole,
         isLowPriority = isLowPriority,
         activeCallIntentConsensus = activeCallIntentConsensus,
+        isDm = false,
     ),
     latestEvent = latestEvent,
 )

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

@@ -30,13 +30,10 @@ class RoomMembersTest {
     private val roomMember3 = aRoomMember(A_USER_ID_3)
 
     @Test
-    fun `getDirectRoomMember emits other member for encrypted DM with 2 joined members`() = runTest {
+    fun `getDirectRoomMember emits other member for encrypted DM`() = runTest {
         val joinedRoom = FakeBaseRoom(
             sessionId = A_USER_ID,
-            initialRoomInfo = aRoomInfo(
+            initialRoomInfo = aRoomInfo(isDm = true, isEncrypted = true)
-                isDirect = true,
-                joinedMembersCount = 2,
-            )
         )
         moleculeFlow(RecompositionMode.Immediate) {
             joinedRoom.getDirectRoomMember(
@@ -51,7 +48,7 @@ class RoomMembersTest {
     fun `getDirectRoomMember emit null if the room is not a dm`() = runTest {
         val joinedRoom = FakeBaseRoom(
             sessionId = A_USER_ID,
-            initialRoomInfo = aRoomInfo(isDirect = false)
+            initialRoomInfo = aRoomInfo(isDm = false)
         )
         moleculeFlow(RecompositionMode.Immediate) {
             joinedRoom.getDirectRoomMember(
@@ -66,10 +63,7 @@ class RoomMembersTest {
     fun `getDirectRoomMember emits other member even if the room is not encrypted`() = runTest {
         val joinedRoom = FakeBaseRoom(
             sessionId = A_USER_ID,
-            initialRoomInfo = aRoomInfo(
+            initialRoomInfo = aRoomInfo(isDm = true)
-                isDirect = true,
-                activeMembersCount = 2,
-            )
         )
         moleculeFlow(RecompositionMode.Immediate) {
             joinedRoom.getDirectRoomMember(
@@ -80,42 +74,11 @@ class RoomMembersTest {
         }
     }
 
-    @Test
-    fun `getDirectRoomMember emit null if the room has only 1 member`() = runTest {
-        val joinedRoom = FakeBaseRoom(
-            sessionId = A_USER_ID,
-            initialRoomInfo = aRoomInfo(isDirect = true)
-        )
-        moleculeFlow(RecompositionMode.Immediate) {
-            joinedRoom.getDirectRoomMember(
-                RoomMembersState.Ready(persistentListOf(roomMember1))
-            )
-        }.test {
-            assertThat(awaitItem().value).isNull()
-        }
-    }
-
-    @Test
-    fun `getDirectRoomMember emit null if the room has only 3 members`() = runTest {
-        val joinedRoom = FakeBaseRoom(
-            sessionId = A_USER_ID,
-        ).apply {
-            givenRoomInfo(aRoomInfo(isDirect = true, activeMembersCount = 3L))
-        }
-        moleculeFlow(RecompositionMode.Immediate) {
-            joinedRoom.getDirectRoomMember(
-                RoomMembersState.Ready(persistentListOf(roomMember1, roomMember2, roomMember3))
-            )
-        }.test {
-            assertThat(awaitItem().value).isNull()
-        }
-    }
-
     @Test
     fun `getDirectRoomMember emit null if the other member is not active`() = runTest {
         val joinedRoom = FakeBaseRoom(
             sessionId = A_USER_ID,
-            initialRoomInfo = aRoomInfo(isDirect = true),
+            initialRoomInfo = aRoomInfo(isDm = true),
         )
         moleculeFlow(RecompositionMode.Immediate) {
             joinedRoom.getDirectRoomMember(
@@ -135,10 +98,7 @@ class RoomMembersTest {
     fun `getDirectRoomMember emit the other member if there are 2 active members`() = runTest {
         val joinedRoom = FakeBaseRoom(
             sessionId = A_USER_ID,
-            initialRoomInfo = aRoomInfo(
+            initialRoomInfo = aRoomInfo(isDm = true)
-                isDirect = true,
-                activeMembersCount = 2,
-            )
         )
         moleculeFlow(RecompositionMode.Immediate) {
             joinedRoom.getDirectRoomMember(

libraries/previewutils/src/main/kotlin/io/element/android/libraries/previewutils/room/RoomMemberFixture.kt

@@ -33,6 +33,7 @@ fun aRoomMember(
     isIgnored: Boolean = false,
     role: RoomMember.Role = RoomMember.Role.User,
     membershipChangeReason: String? = null,
+    isServiceMember: Boolean = false,
 ) = RoomMember(
     userId = userId,
     displayName = displayName,
@@ -43,6 +44,7 @@ fun aRoomMember(
     isIgnored = isIgnored,
     role = role,
     membershipChangeReason = membershipChangeReason,
+    isServiceMember = isServiceMember,
 )
 
 fun aRoomMemberList() = persistentListOf(

libraries/previewutils/src/main/kotlin/io/element/android/libraries/previewutils/room/SpaceRoomFixture.kt

@@ -34,6 +34,7 @@ fun aSpaceRoom(
     topic: String? = null,
     worldReadable: Boolean = false,
     isDirect: Boolean? = null,
+    isDm: Boolean? = null,
     via: List<String> = emptyList(),
 ) = SpaceRoom(
     rawName = rawName,
@@ -51,5 +52,6 @@ fun aSpaceRoom(
     topic = topic,
     worldReadable = worldReadable,
     via = via.toImmutableList(),
-    isDirect = isDirect
+    isDirect = isDirect,
+    isDm = isDm,
 )

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

@@ -19,7 +19,6 @@ 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.room.CreateTimelineParams
 import io.element.android.libraries.matrix.api.room.JoinedRoom
-import io.element.android.libraries.matrix.api.room.isDm
 import io.element.android.libraries.matrix.api.timeline.ReceiptType
 import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.preferences.api.store.SessionPreferencesStoreFactory