Skip to content

Commit e48a9ee

Browse files
committed
Fix typo, remove unnecessary filter of all rooms in the datasource.
1 parent 21ca59e commit e48a9ee

File tree

1 file changed

+4
-11
lines changed
  • features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/datasource

1 file changed

+4
-11
lines changed

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

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import io.element.android.libraries.designsystem.components.avatar.AvatarSize
2828
import io.element.android.libraries.eventformatter.api.RoomLastMessageFormatter
2929
import io.element.android.libraries.matrix.api.core.RoomId
3030
import io.element.android.libraries.matrix.api.notificationsettings.NotificationSettingsService
31-
import io.element.android.libraries.matrix.api.room.RoomNotificationMode
3231
import io.element.android.libraries.matrix.api.roomlist.RoomListService
3332
import io.element.android.libraries.matrix.api.roomlist.RoomSummary
3433
import kotlinx.collections.immutable.ImmutableList
@@ -57,7 +56,7 @@ class RoomListDataSource @Inject constructor(
5756
private val appScope: CoroutineScope,
5857
) {
5958
init {
60-
observerNotificationSettings()
59+
observeNotificationSettings()
6160
}
6261

6362
private val _filter = MutableStateFlow("")
@@ -103,7 +102,7 @@ class RoomListDataSource @Inject constructor(
103102
val filteredRooms: StateFlow<ImmutableList<RoomListRoomSummary>> = _filteredRooms
104103

105104
@OptIn(FlowPreview::class)
106-
private fun observerNotificationSettings() {
105+
private fun observeNotificationSettings() {
107106
notificationSettingsService.notificationSettingsChangeFlow
108107
.debounce(0.5.seconds)
109108
.onEach {
@@ -140,16 +139,10 @@ class RoomListDataSource @Inject constructor(
140139
}
141140
}
142141

143-
private fun buildAndCacheItem(roomSummaries: List<RoomSummary>, index: Int, ): RoomListRoomSummary? {
142+
private fun buildAndCacheItem(roomSummaries: List<RoomSummary>, index: Int): RoomListRoomSummary? {
144143
val roomListRoomSummary = when (val roomSummary = roomSummaries.getOrNull(index)) {
145144
is RoomSummary.Empty -> RoomListRoomSummaryPlaceholders.create(roomSummary.identifier)
146145
is RoomSummary.Filled -> {
147-
// Only show a decoration if the mode is not ALL_MESSAGES
148-
val notificationMode = if (roomSummary.details.notificationMode == RoomNotificationMode.ALL_MESSAGES) {
149-
null
150-
} else {
151-
roomSummary.details.notificationMode
152-
}
153146
val avatarData = AvatarData(
154147
id = roomSummary.identifier(),
155148
name = roomSummary.details.name,
@@ -167,7 +160,7 @@ class RoomListDataSource @Inject constructor(
167160
roomLastMessageFormatter.format(message.event, roomSummary.details.isDirect)
168161
}.orEmpty(),
169162
avatarData = avatarData,
170-
notificationMode = notificationMode
163+
notificationMode = roomSummary.details.notificationMode,
171164
)
172165
}
173166
null -> null

0 commit comments

Comments
 (0)