misc : remove direct usage of RoomSummary in UI and let RoomSummary use RoomInfo.

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

@@ -31,6 +31,7 @@ import im.vector.app.features.analytics.plan.Interaction
 import io.element.android.features.messages.impl.attachments.Attachment
 import io.element.android.features.messages.impl.attachments.preview.error.sendAttachmentError
 import io.element.android.features.messages.impl.draft.ComposerDraftService
+import io.element.android.features.messages.impl.messagecomposer.suggestions.RoomAliasSuggestionsDataSource
 import io.element.android.features.messages.impl.messagecomposer.suggestions.SuggestionsProcessor
 import io.element.android.features.messages.impl.timeline.TimelineController
 import io.element.android.features.messages.impl.utils.TextPillificationHelper

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

@@ -5,20 +5,22 @@
  * Please see LICENSE in the repository root for full details.
  */
 
-package io.element.android.features.messages.impl.messagecomposer
+package io.element.android.features.messages.impl.messagecomposer.suggestions
 
 import com.squareup.anvil.annotations.ContributesBinding
 import io.element.android.libraries.di.SessionScope
 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.roomlist.RoomListService
-import io.element.android.libraries.matrix.api.roomlist.RoomSummary
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import javax.inject.Inject
 
 data class RoomAliasSuggestion(
     val roomAlias: RoomAlias,
-    val roomSummary: RoomSummary,
+    val roomId: RoomId,
+    val roomName: String?,
+    val roomAvatarUrl: String?,
 )
 
 interface RoomAliasSuggestionsDataSource {
@@ -32,14 +34,16 @@ class DefaultRoomAliasSuggestionsDataSource @Inject constructor(
     override fun getAllRoomAliasSuggestions(): Flow<List<RoomAliasSuggestion>> {
         return roomListService
             .allRooms
-            .filteredSummaries
+            .summaries
             .map { roomSummaries ->
                 roomSummaries
                     .mapNotNull { roomSummary ->
-                        roomSummary.canonicalAlias?.let { roomAlias ->
+                        roomSummary.info.canonicalAlias?.let { roomAlias ->
                             RoomAliasSuggestion(
                                 roomAlias = roomAlias,
-                                roomSummary = roomSummary,
+                                roomId = roomSummary.roomId,
+                                roomName = roomSummary.info.name,
+                                roomAvatarUrl = roomSummary.info.avatarUrl,
                             )
                         }
                     }

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

@@ -36,7 +36,6 @@ 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.RoomMember
 import io.element.android.libraries.matrix.api.room.RoomMembershipState
-import io.element.android.libraries.matrix.ui.components.aRoomSummaryDetails
 import io.element.android.libraries.matrix.ui.model.getAvatarData
 import io.element.android.libraries.textcomposer.mentions.ResolvedSuggestion
 import kotlinx.collections.immutable.ImmutableList
@@ -60,7 +59,7 @@ fun SuggestionsPickerView(
                 when (suggestion) {
                     is ResolvedSuggestion.AtRoom -> "@room"
                     is ResolvedSuggestion.Member -> suggestion.roomMember.userId.value
-                    is ResolvedSuggestion.Alias -> suggestion.roomSummary.roomId.value
+                    is ResolvedSuggestion.Alias -> suggestion.roomId.value
                 }
             }
         ) {
@@ -96,12 +95,12 @@ private fun SuggestionItemView(
         val avatarData = when (suggestion) {
             is ResolvedSuggestion.AtRoom -> roomAvatar?.copy(size = avatarSize) ?: AvatarData(roomId, roomName, null, avatarSize)
             is ResolvedSuggestion.Member -> suggestion.roomMember.getAvatarData(avatarSize)
-            is ResolvedSuggestion.Alias -> suggestion.roomSummary.getAvatarData(avatarSize)
+            is ResolvedSuggestion.Alias -> suggestion.getAvatarData(avatarSize)
         }
         val title = when (suggestion) {
             is ResolvedSuggestion.AtRoom -> stringResource(R.string.screen_room_mentions_at_room_title)
             is ResolvedSuggestion.Member -> suggestion.roomMember.displayName
-            is ResolvedSuggestion.Alias -> suggestion.roomSummary.name
+            is ResolvedSuggestion.Alias -> suggestion.roomName
         }
         val subtitle = when (suggestion) {
             is ResolvedSuggestion.AtRoom -> "@room"
@@ -152,11 +151,6 @@ internal fun SuggestionsPickerViewPreview() {
             role = RoomMember.Role.USER,
         )
         val anAlias = remember { RoomAlias("#room:domain.org") }
-        val roomSummaryDetails = remember {
-            aRoomSummaryDetails(
-                name = "My room",
-            )
-        }
         SuggestionsPickerView(
             roomId = RoomId("!room:matrix.org"),
             roomName = "Room",
@@ -166,8 +160,10 @@ internal fun SuggestionsPickerViewPreview() {
                 ResolvedSuggestion.Member(roomMember),
                 ResolvedSuggestion.Member(roomMember.copy(userId = UserId("@bob:server.org"), displayName = "Bob")),
                 ResolvedSuggestion.Alias(
-                    anAlias,
-                    roomSummaryDetails,
+                    roomAlias = anAlias,
+                    roomId = RoomId("!room:matrix.org"),
+                    roomName = "My room",
+                    roomAvatarUrl = null,
                 )
             ),
             onSelectSuggestion = {}

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

@@ -7,7 +7,6 @@
 
 package io.element.android.features.messages.impl.messagecomposer.suggestions
 
-import io.element.android.features.messages.impl.messagecomposer.RoomAliasSuggestion
 import io.element.android.libraries.core.data.filterUpTo
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.room.MatrixRoomMembersState
@@ -55,7 +54,14 @@ class SuggestionsProcessor @Inject constructor() {
             SuggestionType.Room -> {
                 roomAliasSuggestions
                     .filter { it.roomAlias.value.contains(suggestion.text, ignoreCase = true) }
-                    .map { ResolvedSuggestion.Alias(it.roomAlias, it.roomSummary) }
+                    .map {
+                        ResolvedSuggestion.Alias(
+                            roomAlias = it.roomAlias,
+                            roomId = it.roomId,
+                            roomName = it.roomName,
+                            roomAvatarUrl = it.roomAvatarUrl,
+                        )
+                    }
             }
             SuggestionType.Command,
             is SuggestionType.Custom -> {

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

@@ -9,6 +9,8 @@ package io.element.android.features.messages.impl.messagecomposer
 
 import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
+import io.element.android.features.messages.impl.messagecomposer.suggestions.DefaultRoomAliasSuggestionsDataSource
+import io.element.android.features.messages.impl.messagecomposer.suggestions.RoomAliasSuggestion
 import io.element.android.libraries.matrix.test.A_ROOM_ALIAS
 import io.element.android.libraries.matrix.test.A_ROOM_ID_2
 import io.element.android.libraries.matrix.test.room.aRoomSummary
@@ -38,7 +40,9 @@ class DefaultRoomAliasSuggestionsDataSourceTest {
                 listOf(
                     RoomAliasSuggestion(
                         roomAlias = A_ROOM_ALIAS,
-                        roomSummary = aRoomSummaryWithAnAlias
+                        roomId = aRoomSummaryWithAnAlias.roomId,
+                        roomName = aRoomSummaryWithAnAlias.info.name,
+                        roomAvatarUrl = aRoomSummaryWithAnAlias.info.avatarUrl
                     )
                 )
             )

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

@@ -7,6 +7,8 @@
 
 package io.element.android.features.messages.impl.messagecomposer
 
+import io.element.android.features.messages.impl.messagecomposer.suggestions.RoomAliasSuggestion
+import io.element.android.features.messages.impl.messagecomposer.suggestions.RoomAliasSuggestionsDataSource
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 

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

@@ -8,7 +8,6 @@
 package io.element.android.features.messages.impl.messagecomposer.suggestions
 
 import com.google.common.truth.Truth.assertThat
-import io.element.android.features.messages.impl.messagecomposer.RoomAliasSuggestion
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.room.MatrixRoomMembersState
 import io.element.android.libraries.matrix.api.room.RoomMembershipState
@@ -110,13 +109,25 @@ class SuggestionsProcessorTest {
         val result = suggestionsProcessor.process(
             suggestion = aRoomSuggestion("ALI"),
             roomMembersState = MatrixRoomMembersState.Ready(persistentListOf()),
-            roomAliasSuggestions = listOf(RoomAliasSuggestion(A_ROOM_ALIAS, aRoomSummary)),
+            roomAliasSuggestions = listOf(
+                RoomAliasSuggestion(
+                    roomAlias = A_ROOM_ALIAS,
+                    roomId = aRoomSummary.roomId,
+                    roomName = aRoomSummary.info.name,
+                    roomAvatarUrl = aRoomSummary.info.avatarUrl,
+                )
+            ),
             currentUserId = A_USER_ID,
             canSendRoomMention = { true },
         )
         assertThat(result).isEqualTo(
             listOf(
-                ResolvedSuggestion.Alias(A_ROOM_ALIAS, aRoomSummary)
+                ResolvedSuggestion.Alias(
+                    roomAlias = A_ROOM_ALIAS,
+                    roomId = aRoomSummary.roomId,
+                    roomName = aRoomSummary.info.name,
+                    roomAvatarUrl = aRoomSummary.info.avatarUrl,
+                )
             )
         )
     }
@@ -127,13 +138,25 @@ class SuggestionsProcessorTest {
         val result = suggestionsProcessor.process(
             suggestion = aRoomSuggestion("ali"),
             roomMembersState = MatrixRoomMembersState.Ready(persistentListOf()),
-            roomAliasSuggestions = listOf(RoomAliasSuggestion(A_ROOM_ALIAS, aRoomSummary)),
+            roomAliasSuggestions = listOf(
+                RoomAliasSuggestion(
+                    roomAlias = A_ROOM_ALIAS,
+                    roomId = aRoomSummary.roomId,
+                    roomName = aRoomSummary.info.name,
+                    roomAvatarUrl = aRoomSummary.info.avatarUrl,
+                )
+            ),
             currentUserId = A_USER_ID,
             canSendRoomMention = { true },
         )
         assertThat(result).isEqualTo(
             listOf(
-                ResolvedSuggestion.Alias(A_ROOM_ALIAS, aRoomSummary)
+                ResolvedSuggestion.Alias(
+                    roomAlias = A_ROOM_ALIAS,
+                    roomId = aRoomSummary.roomId,
+                    roomName = aRoomSummary.info.name,
+                    roomAvatarUrl = aRoomSummary.info.avatarUrl,
+                )
             )
         )
     }
@@ -144,7 +167,14 @@ class SuggestionsProcessorTest {
         val result = suggestionsProcessor.process(
             suggestion = aRoomSuggestion("tot"),
             roomMembersState = MatrixRoomMembersState.Ready(persistentListOf()),
-            roomAliasSuggestions = listOf(RoomAliasSuggestion(A_ROOM_ALIAS, aRoomSummary)),
+            roomAliasSuggestions = listOf(
+                RoomAliasSuggestion(
+                    roomAlias = A_ROOM_ALIAS,
+                    roomId = aRoomSummary.roomId,
+                    roomName = aRoomSummary.info.name,
+                    roomAvatarUrl = aRoomSummary.info.avatarUrl,
+                )
+            ),
             currentUserId = A_USER_ID,
             canSendRoomMention = { true },
         )

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

@@ -21,11 +21,12 @@ import dagger.assisted.AssistedInject
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.architecture.runUpdatingStateNoSuccess
-import io.element.android.libraries.matrix.api.MatrixClient
+import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.matrix.api.notificationsettings.NotificationSettingsService
 import io.element.android.libraries.matrix.api.room.RoomNotificationMode
 import io.element.android.libraries.matrix.api.roomlist.RoomListService
 import io.element.android.libraries.matrix.api.roomlist.RoomSummary
+import io.element.android.libraries.matrix.ui.model.getAvatarData
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.FlowPreview
@@ -40,7 +41,6 @@ class EditDefaultNotificationSettingPresenter @AssistedInject constructor(
     private val notificationSettingsService: NotificationSettingsService,
     @Assisted private val isOneToOne: Boolean,
     private val roomListService: RoomListService,
-    private val matrixClient: MatrixClient,
 ) : Presenter<EditDefaultNotificationSettingState> {
     @AssistedFactory
     interface Factory {
@@ -57,8 +57,8 @@ class EditDefaultNotificationSettingPresenter @AssistedInject constructor(
 
         val changeNotificationSettingAction: MutableState<AsyncAction<Unit>> = remember { mutableStateOf(AsyncAction.Uninitialized) }
 
-        val roomsWithUserDefinedMode: MutableState<List<RoomSummary>> = remember {
-            mutableStateOf(listOf())
+        val roomsWithUserDefinedMode: MutableState<List<EditNotificationSettingRoomInfo>> = remember {
+            mutableStateOf(emptyList())
         }
 
         val localCoroutineScope = rememberCoroutineScope()
@@ -106,31 +106,37 @@ class EditDefaultNotificationSettingPresenter @AssistedInject constructor(
             .launchIn(this)
     }
 
-    private fun CoroutineScope.observeRoomSummaries(roomsWithUserDefinedMode: MutableState<List<RoomSummary>>) {
+    private fun CoroutineScope.observeRoomSummaries(roomsWithUserDefinedMode: MutableState<List<EditNotificationSettingRoomInfo>>) {
         roomListService.allRooms
             .summaries
-            .onEach {
-                updateRoomsWithUserDefinedMode(it, roomsWithUserDefinedMode)
+            .onEach { roomSummaries ->
+                updateRoomsWithUserDefinedMode(roomSummaries, roomsWithUserDefinedMode)
             }
             .launchIn(this)
     }
 
-    private fun CoroutineScope.updateRoomsWithUserDefinedMode(
+    private suspend fun updateRoomsWithUserDefinedMode(
         summaries: List<RoomSummary>,
-        roomsWithUserDefinedMode: MutableState<List<RoomSummary>>
-    ) = launch {
-        val roomWithUserDefinedRules: Set<String> = notificationSettingsService.getRoomsWithUserDefinedRules().getOrThrow().toSet()
-
-        val sortedSummaries = summaries
-            .filterIsInstance<RoomSummary>()
-            .filter {
-                val room = matrixClient.getRoom(it.roomId) ?: return@filter false
-                roomWithUserDefinedRules.contains(it.roomId.value) && isOneToOne == room.isOneToOne
+        roomsWithUserDefinedMode: MutableState<List<EditNotificationSettingRoomInfo>>
+    ) {
+        val roomWithUserDefinedRules: Set<String> = notificationSettingsService.getRoomsWithUserDefinedRules().getOrDefault(emptyList()).toSet()
+        roomsWithUserDefinedMode.value = summaries
+            .filter { roomSummary ->
+                roomWithUserDefinedRules.contains(roomSummary.roomId.value) && roomSummary.isOneToOne == isOneToOne
+            }
+            .map { roomSummary ->
+                EditNotificationSettingRoomInfo(
+                    roomId = roomSummary.roomId,
+                    name = roomSummary.info.name,
+                    heroesAvatar = roomSummary.info.heroes.map { hero ->
+                        hero.getAvatarData(AvatarSize.CustomRoomNotificationSetting)
+                    }.toImmutableList(),
+                    avatarData = roomSummary.info.getAvatarData(AvatarSize.CustomRoomNotificationSetting),
+                    notificationMode = roomSummary.info.userDefinedNotificationMode,
+                )
             }
             // locale sensitive sorting
-            .sortedWith(compareBy(Collator.getInstance()) { it.name })
-
-        roomsWithUserDefinedMode.value = sortedSummaries
+            .sortedWith(compareBy(Collator.getInstance()) { roomSummary -> roomSummary.name })
     }
 
     private fun CoroutineScope.setDefaultNotificationMode(mode: RoomNotificationMode, action: MutableState<AsyncAction<Unit>>) = launch {

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

@@ -9,13 +9,12 @@ package io.element.android.features.preferences.impl.notifications.edit
 
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.matrix.api.room.RoomNotificationMode
-import io.element.android.libraries.matrix.api.roomlist.RoomSummary
 import kotlinx.collections.immutable.ImmutableList
 
 data class EditDefaultNotificationSettingState(
     val isOneToOne: Boolean,
     val mode: RoomNotificationMode?,
-    val roomsWithUserDefinedMode: ImmutableList<RoomSummary>,
+    val roomsWithUserDefinedMode: ImmutableList<EditNotificationSettingRoomInfo>,
     val changeNotificationSettingAction: AsyncAction<Unit>,
     val displayMentionsOnlyDisclaimer: Boolean,
     val eventSink: (EditDefaultNotificationSettingStateEvents) -> Unit,

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

@@ -9,9 +9,10 @@ package io.element.android.features.preferences.impl.notifications.edit
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.libraries.architecture.AsyncAction
+import io.element.android.libraries.designsystem.components.avatar.AvatarData
+import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.room.RoomNotificationMode
-import io.element.android.libraries.matrix.ui.components.aRoomSummaryDetails
 import kotlinx.collections.immutable.persistentListOf
 
 open class EditDefaultNotificationSettingStateProvider : PreviewParameterProvider<EditDefaultNotificationSettingState> {
@@ -33,21 +34,25 @@ private fun anEditDefaultNotificationSettingsState(
     isOneToOne = isOneToOne,
     mode = RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY,
     roomsWithUserDefinedMode = persistentListOf(
-        aRoomSummary("Room"),
-        aRoomSummary(null),
+        anEditNotificationSettingRoomInfo("Room"),
+        anEditNotificationSettingRoomInfo(null),
     ),
     changeNotificationSettingAction = changeNotificationSettingAction,
     displayMentionsOnlyDisclaimer = displayMentionsOnlyDisclaimer,
     eventSink = {}
 )
 
-private fun aRoomSummary(
+private fun anEditNotificationSettingRoomInfo(
     name: String?,
-) = aRoomSummaryDetails(
+) = EditNotificationSettingRoomInfo(
     roomId = RoomId("!roomId:domain"),
     name = name,
-    avatarUrl = null,
-    isDirect = false,
-    lastMessage = null,
+    avatarData = AvatarData(
+        id = "!roomId:domain",
+        name = name,
+        url = null,
+        size = AvatarSize.CustomRoomNotificationSetting,
+    ),
+    heroesAvatar = persistentListOf(),
     notificationMode = RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY,
 )

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

@@ -16,7 +16,6 @@ import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import io.element.android.features.preferences.impl.R
 import io.element.android.libraries.designsystem.components.async.AsyncActionView
-import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.designsystem.components.avatar.CompositeAvatar
 import io.element.android.libraries.designsystem.components.list.ListItemContent
 import io.element.android.libraries.designsystem.components.preferences.PreferenceCategory
@@ -27,9 +26,7 @@ import io.element.android.libraries.designsystem.theme.components.ListItem
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.room.RoomNotificationMode
-import io.element.android.libraries.matrix.ui.model.getAvatarData
 import io.element.android.libraries.ui.strings.CommonStrings
-import kotlinx.collections.immutable.toPersistentList
 
 /**
  * A view that allows a user to edit the default notification setting for rooms. This can be set separately
@@ -80,7 +77,7 @@ fun EditDefaultNotificationSettingView(
         if (state.roomsWithUserDefinedMode.isNotEmpty()) {
             PreferenceCategory(title = stringResource(id = R.string.screen_notification_settings_edit_custom_settings_section_title)) {
                 state.roomsWithUserDefinedMode.forEach { summary ->
-                    val subtitle = when (summary.userDefinedNotificationMode) {
+                    val subtitle = when (summary.notificationMode) {
                         RoomNotificationMode.ALL_MESSAGES -> stringResource(id = R.string.screen_notification_settings_edit_mode_all_messages)
                         RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY -> {
                             stringResource(id = R.string.screen_notification_settings_edit_mode_mentions_and_keywords)
@@ -101,10 +98,8 @@ fun EditDefaultNotificationSettingView(
                         },
                         leadingContent = ListItemContent.Custom {
                             CompositeAvatar(
-                                avatarData = summary.getAvatarData(size = AvatarSize.CustomRoomNotificationSetting),
-                                heroes = summary.heroes.map { user ->
-                                    user.getAvatarData(size = AvatarSize.CustomRoomNotificationSetting)
-                                }.toPersistentList()
+                                avatarData = summary.avatarData,
+                                heroes = summary.heroesAvatar,
                             )
                         },
                         onClick = {

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

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2024 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only
+ * Please see LICENSE in the repository root for full details.
+ */
+
+package io.element.android.features.preferences.impl.notifications.edit
+
+import io.element.android.libraries.designsystem.components.avatar.AvatarData
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.room.RoomNotificationMode
+import kotlinx.collections.immutable.ImmutableList
+
+data class EditNotificationSettingRoomInfo(
+    val roomId: RoomId,
+    val name: String?,
+    val heroesAvatar: ImmutableList<AvatarData>,
+    val avatarData: AvatarData,
+    val notificationMode: RoomNotificationMode?
+)

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

@@ -14,11 +14,8 @@ import com.google.common.truth.Truth.assertThat
 import io.element.android.features.preferences.impl.notifications.edit.EditDefaultNotificationSettingPresenter
 import io.element.android.features.preferences.impl.notifications.edit.EditDefaultNotificationSettingStateEvents
 import io.element.android.libraries.matrix.api.room.RoomNotificationMode
-import io.element.android.libraries.matrix.test.A_ROOM_ID
 import io.element.android.libraries.matrix.test.A_THROWABLE
-import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.notificationsettings.FakeNotificationSettingsService
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
 import io.element.android.libraries.matrix.test.room.aRoomSummary
 import io.element.android.libraries.matrix.test.roomlist.FakeRoomListService
 import io.element.android.tests.testutils.awaitLastSequentialItem
@@ -49,24 +46,20 @@ class EditDefaultNotificationSettingsPresenterTest {
 
     @Test
     fun `present - ensure list of rooms with user defined mode`() = runTest {
-        val room = FakeMatrixRoom()
         val notificationSettingsService = FakeNotificationSettingsService(
             initialRoomMode = RoomNotificationMode.ALL_MESSAGES,
             initialRoomModeIsDefault = false
         )
-        val matrixClient = FakeMatrixClient(notificationSettingsService = notificationSettingsService).apply {
-            givenGetRoomResult(A_ROOM_ID, room)
-        }
         val roomListService = FakeRoomListService()
-        val presenter = createEditDefaultNotificationSettingPresenter(notificationSettingsService, roomListService, matrixClient)
+        val presenter = createEditDefaultNotificationSettingPresenter(notificationSettingsService, roomListService)
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
         }.test {
-            roomListService.postAllRooms(listOf(aRoomSummary(notificationMode = RoomNotificationMode.ALL_MESSAGES)))
+            roomListService.postAllRooms(listOf(aRoomSummary(userDefinedNotificationMode = RoomNotificationMode.ALL_MESSAGES)))
             val loadedState = consumeItemsUntilPredicate { state ->
-                state.roomsWithUserDefinedMode.any { it.userDefinedNotificationMode == RoomNotificationMode.ALL_MESSAGES }
+                state.roomsWithUserDefinedMode.any { it.notificationMode == RoomNotificationMode.ALL_MESSAGES }
             }.last()
-            assertThat(loadedState.roomsWithUserDefinedMode.any { it.userDefinedNotificationMode == RoomNotificationMode.ALL_MESSAGES }).isTrue()
+            assertThat(loadedState.roomsWithUserDefinedMode.any { it.notificationMode == RoomNotificationMode.ALL_MESSAGES }).isTrue()
         }
     }
 
@@ -121,13 +114,11 @@ class EditDefaultNotificationSettingsPresenterTest {
     private fun createEditDefaultNotificationSettingPresenter(
         notificationSettingsService: FakeNotificationSettingsService = FakeNotificationSettingsService(),
         roomListService: FakeRoomListService = FakeRoomListService(),
-        matrixClient: FakeMatrixClient = FakeMatrixClient(notificationSettingsService = notificationSettingsService)
     ): EditDefaultNotificationSettingPresenter {
         return EditDefaultNotificationSettingPresenter(
             notificationSettingsService = notificationSettingsService,
             isOneToOne = false,
             roomListService = roomListService,
-            matrixClient = matrixClient
         )
     }
 }

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

@@ -14,6 +14,7 @@ import io.element.android.libraries.dateformatter.api.LastMessageTimestampFormat
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.eventformatter.api.RoomLastMessageFormatter
 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.RoomSummary
 import io.element.android.libraries.matrix.ui.model.getAvatarData
 import io.element.android.libraries.matrix.ui.model.toInviteSender
@@ -24,34 +25,35 @@ class RoomListRoomSummaryFactory @Inject constructor(
     private val lastMessageTimestampFormatter: LastMessageTimestampFormatter,
     private val roomLastMessageFormatter: RoomLastMessageFormatter,
 ) {
-    fun create(details: RoomSummary): RoomListRoomSummary {
-        val avatarData = details.getAvatarData(size = AvatarSize.RoomListItem)
+    fun create(roomSummary: RoomSummary): RoomListRoomSummary {
+        val roomInfo = roomSummary.info
+        val avatarData = roomInfo.getAvatarData(size = AvatarSize.RoomListItem)
         return RoomListRoomSummary(
-            id = details.roomId.value,
-            roomId = details.roomId,
-            name = details.name,
-            numberOfUnreadMessages = details.numUnreadMessages,
-            numberOfUnreadMentions = details.numUnreadMentions,
-            numberOfUnreadNotifications = details.numUnreadNotifications,
-            isMarkedUnread = details.isMarkedUnread,
-            timestamp = lastMessageTimestampFormatter.format(details.lastMessageTimestamp),
-            lastMessage = details.lastMessage?.let { message ->
-                roomLastMessageFormatter.format(message.event, details.isDm)
+            id = roomSummary.roomId.value,
+            roomId = roomSummary.roomId,
+            name = roomInfo.name,
+            numberOfUnreadMessages = roomInfo.numUnreadMessages,
+            numberOfUnreadMentions = roomInfo.numUnreadMentions,
+            numberOfUnreadNotifications = roomInfo.numUnreadNotifications,
+            isMarkedUnread = roomInfo.isMarkedUnread,
+            timestamp = lastMessageTimestampFormatter.format(roomSummary.lastMessageTimestamp),
+            lastMessage = roomSummary.lastMessage?.let { message ->
+                roomLastMessageFormatter.format(message.event, roomInfo.isDm)
             }.orEmpty(),
             avatarData = avatarData,
-            userDefinedNotificationMode = details.userDefinedNotificationMode,
-            hasRoomCall = details.hasRoomCall,
-            isDirect = details.isDirect,
-            isFavorite = details.isFavorite,
-            inviteSender = details.inviter?.toInviteSender(),
-            isDm = details.isDm,
-            canonicalAlias = details.canonicalAlias,
-            displayType = if (details.currentUserMembership == CurrentUserMembership.INVITED) {
+            userDefinedNotificationMode = roomInfo.userDefinedNotificationMode,
+            hasRoomCall = roomInfo.hasRoomCall,
+            isDirect = roomInfo.isDirect,
+            isFavorite = roomInfo.isFavorite,
+            inviteSender = roomInfo.inviter?.toInviteSender(),
+            isDm = roomInfo.isDm,
+            canonicalAlias = roomInfo.canonicalAlias,
+            displayType = if (roomInfo.currentUserMembership == CurrentUserMembership.INVITED) {
                 RoomSummaryDisplayType.INVITE
             } else {
                 RoomSummaryDisplayType.ROOM
             },
-            heroes = details.heroes.map { user ->
+            heroes = roomInfo.heroes.map { user ->
                 user.getAvatarData(size = AvatarSize.RoomListItem)
             }.toImmutableList(),
         )

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

@@ -22,9 +22,9 @@ data class RoomListRoomSummary(
     val roomId: RoomId,
     val name: String?,
     val canonicalAlias: RoomAlias?,
-    val numberOfUnreadMessages: Int,
-    val numberOfUnreadMentions: Int,
-    val numberOfUnreadNotifications: Int,
+    val numberOfUnreadMessages: Long,
+    val numberOfUnreadMentions: Long,
+    val numberOfUnreadNotifications: Long,
     val isMarkedUnread: Boolean,
     val timestamp: String?,
     val lastMessage: CharSequence?,

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

@@ -119,9 +119,9 @@ internal fun anInviteSender(
 internal fun aRoomListRoomSummary(
     id: String = "!roomId:domain",
     name: String? = "Room name",
-    numberOfUnreadMessages: Int = 0,
-    numberOfUnreadMentions: Int = 0,
-    numberOfUnreadNotifications: Int = 0,
+    numberOfUnreadMessages: Long = 0,
+    numberOfUnreadMentions: Long = 0,
+    numberOfUnreadNotifications: Long = 0,
     isMarkedUnread: Boolean = false,
     lastMessage: String? = "Last message",
     timestamp: String? = lastMessage?.let { "88:88" },

features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListPresenterTest.kt

@@ -396,7 +396,7 @@ class RoomListPresenterTest {
         val notificationSettingsService = FakeNotificationSettingsService()
         val roomListService = FakeRoomListService()
         roomListService.postAllRoomsLoadingState(RoomList.LoadingState.Loaded(1))
-        roomListService.postAllRooms(listOf(aRoomSummary(notificationMode = userDefinedMode)))
+        roomListService.postAllRooms(listOf(aRoomSummary(userDefinedNotificationMode = userDefinedMode)))
         val matrixClient = FakeMatrixClient(
             roomListService = roomListService,
             notificationSettingsService = notificationSettingsService

features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/model/RoomListRoomSummaryTest.kt

@@ -76,9 +76,9 @@ class RoomListRoomSummaryTest {
 }
 
 internal fun createRoomListRoomSummary(
-    numberOfUnreadMentions: Int = 0,
-    numberOfUnreadMessages: Int = 0,
-    numberOfUnreadNotifications: Int = 0,
+    numberOfUnreadMentions: Long = 0,
+    numberOfUnreadMessages: Long = 0,
+    numberOfUnreadNotifications: Long = 0,
     isMarkedUnread: Boolean = false,
     userDefinedNotificationMode: RoomNotificationMode? = null,
     isFavorite: Boolean = false,