Merge pull request #5822 from element-hq/feature/bma/cleanupRoomMemberListDataSource

Inject RoomMemberListDataSource in the presenter constructor.
This commit is contained in:
Benoit Marty
2025-11-27 10:36:35 +01:00
committed by GitHub
2 changed files with 3 additions and 4 deletions

View File

@@ -27,7 +27,6 @@ import io.element.android.features.rolesandpermissions.impl.RoomMemberListDataSo
import io.element.android.libraries.architecture.AsyncAction
import io.element.android.libraries.architecture.Presenter
import io.element.android.libraries.architecture.runUpdatingState
import io.element.android.libraries.core.coroutine.CoroutineDispatchers
import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
import io.element.android.libraries.di.annotations.RoomCoroutineScope
import io.element.android.libraries.matrix.api.core.UserId
@@ -55,7 +54,7 @@ import kotlinx.coroutines.launch
class ChangeRolesPresenter(
@Assisted private val role: RoomMember.Role,
private val room: JoinedRoom,
private val dispatchers: CoroutineDispatchers,
private val dataSource: RoomMemberListDataSource,
private val analyticsService: AnalyticsService,
@RoomCoroutineScope private val roomCoroutineScope: CoroutineScope,
) : Presenter<ChangeRolesState> {
@@ -68,7 +67,6 @@ class ChangeRolesPresenter(
@Composable
override fun present(): ChangeRolesState {
val dataSource = remember { RoomMemberListDataSource(room, dispatchers) }
var query by rememberSaveable { mutableStateOf<String?>(null) }
var searchActive by rememberSaveable { mutableStateOf(false) }
var searchResults by remember {

View File

@@ -10,6 +10,7 @@ package io.element.android.features.rolesandpermissions.impl.roles
import com.google.common.truth.Truth.assertThat
import im.vector.app.features.analytics.plan.RoomModeration
import io.element.android.features.rolesandpermissions.impl.RoomMemberListDataSource
import io.element.android.libraries.architecture.AsyncAction
import io.element.android.libraries.core.coroutine.CoroutineDispatchers
import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
@@ -576,7 +577,7 @@ internal fun TestScope.createChangeRolesPresenter(
return ChangeRolesPresenter(
role = role,
room = room,
dispatchers = dispatchers,
dataSource = RoomMemberListDataSource(room, dispatchers),
analyticsService = analyticsService,
roomCoroutineScope = this,
)