ehealthsolutions/element-x-android
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-android.git synced 2026-11-02 12:07:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace CurrentUserProvider by an extension on MatrixClient.

Browse Source
This commit is contained in:
Benoit Marty
2023-07-03 16:48:22 +02:00
committed by Benoit Marty
parent 312a5890af
commit 73b1ffd7d0
6 changed files with 19 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListPresenter.kt
+2 -3
View File
@@ -44,8 +44,8 @@ import io.element.android.libraries.eventformatter.api.RoomLastMessageFormatter
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.RoomSummary
import io.element.android.libraries.matrix.api.user.CurrentUserProvider
import io.element.android.libraries.matrix.api.user.MatrixUser
import io.element.android.libraries.matrix.api.user.getCurrentUser
import io.element.android.libraries.matrix.api.verification.SessionVerificationService
import io.element.android.libraries.matrix.api.verification.SessionVerifiedStatus
import kotlinx.collections.immutable.ImmutableList
@@ -60,7 +60,6 @@ private const val extendedRangeSize = 40
class RoomListPresenter @Inject constructor(
private val client: MatrixClient,
private val currentUserProvider: CurrentUserProvider,
private val lastMessageTimestampFormatter: LastMessageTimestampFormatter,
private val roomLastMessageFormatter: RoomLastMessageFormatter,
private val sessionVerificationService: SessionVerificationService,
@@ -163,7 +162,7 @@ class RoomListPresenter @Inject constructor(
}
private fun CoroutineScope.initialLoad(matrixUser: MutableState<MatrixUser?>) = launch {
matrixUser.value = currentUserProvider.provide()
matrixUser.value = client.getCurrentUser()
}
private fun updateVisibleRange(range: IntRange) {
features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListPresenterTests.kt
-12
View File
@@ -31,7 +31,6 @@ import io.element.android.libraries.designsystem.components.avatar.AvatarData
import io.element.android.libraries.designsystem.components.avatar.AvatarSize
import io.element.android.libraries.designsystem.utils.SnackbarDispatcher
import io.element.android.libraries.eventformatter.test.FakeRoomLastMessageFormatter
import io.element.android.libraries.matrix.api.user.CurrentUserProvider
import io.element.android.libraries.matrix.api.verification.SessionVerifiedStatus
import io.element.android.libraries.matrix.test.AN_AVATAR_URL
import io.element.android.libraries.matrix.test.AN_EXCEPTION
@@ -54,7 +53,6 @@ class RoomListPresenterTests {
val matrixClient = FakeMatrixClient()
val presenter = RoomListPresenter(
matrixClient,
CurrentUserProvider(matrixClient),
createDateFormatter(),
FakeRoomLastMessageFormatter(),
FakeSessionVerificationService(),
@@ -84,7 +82,6 @@ class RoomListPresenterTests {
)
val presenter = RoomListPresenter(
matrixClient,
CurrentUserProvider(matrixClient),
createDateFormatter(),
FakeRoomLastMessageFormatter(),
FakeSessionVerificationService(),
@@ -108,7 +105,6 @@ class RoomListPresenterTests {
val matrixClient = FakeMatrixClient()
val presenter = RoomListPresenter(
matrixClient,
CurrentUserProvider(matrixClient),
createDateFormatter(),
FakeRoomLastMessageFormatter(),
FakeSessionVerificationService(),
@@ -139,7 +135,6 @@ class RoomListPresenterTests {
)
val presenter = RoomListPresenter(
matrixClient,
CurrentUserProvider(matrixClient),
createDateFormatter(),
FakeRoomLastMessageFormatter(),
FakeSessionVerificationService(),
@@ -173,7 +168,6 @@ class RoomListPresenterTests {
)
val presenter = RoomListPresenter(
matrixClient,
CurrentUserProvider(matrixClient),
createDateFormatter(),
FakeRoomLastMessageFormatter(),
FakeSessionVerificationService(),
@@ -213,7 +207,6 @@ class RoomListPresenterTests {
)
val presenter = RoomListPresenter(
matrixClient,
CurrentUserProvider(matrixClient),
createDateFormatter(),
FakeRoomLastMessageFormatter(),
FakeSessionVerificationService(),
@@ -263,7 +256,6 @@ class RoomListPresenterTests {
)
val presenter = RoomListPresenter(
matrixClient,
CurrentUserProvider(matrixClient),
createDateFormatter(),
FakeRoomLastMessageFormatter(),
FakeSessionVerificationService().apply {
@@ -292,7 +284,6 @@ class RoomListPresenterTests {
val matrixClient = FakeMatrixClient()
val presenter = RoomListPresenter(
matrixClient,
CurrentUserProvider(matrixClient),
createDateFormatter(),
FakeRoomLastMessageFormatter(),
FakeSessionVerificationService(),
@@ -324,7 +315,6 @@ class RoomListPresenterTests {
val matrixClient = FakeMatrixClient()
val presenter = RoomListPresenter(
matrixClient,
CurrentUserProvider(matrixClient),
createDateFormatter(),
FakeRoomLastMessageFormatter(),
FakeSessionVerificationService(),
@@ -353,7 +343,6 @@ class RoomListPresenterTests {
val matrixClient = FakeMatrixClient()
val presenter = RoomListPresenter(
matrixClient,
CurrentUserProvider(matrixClient),
createDateFormatter(),
FakeRoomLastMessageFormatter(),
FakeSessionVerificationService(),
@@ -387,7 +376,6 @@ class RoomListPresenterTests {
val matrixClient = FakeMatrixClient()
val presenter = RoomListPresenter(
matrixClient,
CurrentUserProvider(matrixClient),
createDateFormatter(),
FakeRoomLastMessageFormatter(),
FakeSessionVerificationService(),