Merge pull request #5466 from element-hq/feature/bma/replaceFunByVal

Replace fun by val in MatrixClient

features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenPresenter.kt

@@ -242,7 +242,7 @@ class CallScreenPresenter(
             }
             coroutineScope.launch {
                 Timber.d("Observing sync state in-call for sessionId: ${roomCallType.sessionId}")
-                client.syncService().syncState
+                client.syncService.syncState
                     .collect { state ->
                         if (state != SyncState.Running) {
                             appForegroundStateService.updateIsInCallState(true)

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenter.kt

@@ -39,7 +39,6 @@ import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.fullscreenintent.api.FullScreenIntentPermissionsState
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.RoomId
-import io.element.android.libraries.matrix.api.encryption.EncryptionService
 import io.element.android.libraries.matrix.api.encryption.RecoveryState
 import io.element.android.libraries.matrix.api.roomlist.RoomList
 import io.element.android.libraries.matrix.api.timeline.ReceiptType
@@ -84,7 +83,7 @@ class RoomListPresenter(
     private val appPreferencesStore: AppPreferencesStore,
     private val seenInvitesStore: SeenInvitesStore,
 ) : Presenter<RoomListState> {
-    private val encryptionService: EncryptionService = client.encryptionService()
+    private val encryptionService = client.encryptionService
 
     @Composable
     override fun present(): RoomListState {

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

@@ -616,7 +616,7 @@ class RoomListPresenterTest {
                 roomLastMessageFormatter = roomLastMessageFormatter,
             ),
             coroutineDispatchers = testCoroutineDispatchers(),
-            notificationSettingsService = client.notificationSettingsService(),
+            notificationSettingsService = client.notificationSettingsService,
             sessionCoroutineScope = backgroundScope,
             dateTimeObserver = FakeDateTimeObserver(),
         ),

features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountPresenter.kt

@@ -82,7 +82,7 @@ class CreateAccountPresenter(
             tryOrNull {
                 // Wait until the session is verified
                 val client = clientProvider.getOrRestore(sessionId).getOrThrow()
-                val sessionVerificationService = client.sessionVerificationService()
+                val sessionVerificationService = client.sessionVerificationService
                 withTimeout(10.seconds) { sessionVerificationService.sessionVerifiedStatus.first { it.isVerified() } }
             }
             loggedInState.value = AsyncAction.Success(sessionId)

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

@@ -62,9 +62,9 @@ import io.element.android.libraries.dateformatter.api.DateFormatter
 import io.element.android.libraries.dateformatter.api.DateFormatterMode
 import io.element.android.libraries.dateformatter.api.toHumanReadableDuration
 import io.element.android.libraries.di.RoomScope
-import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.EventId
 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.core.ThreadId
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.core.toRoomIdOrAlias
@@ -73,6 +73,7 @@ import io.element.android.libraries.matrix.api.permalink.PermalinkData
 import io.element.android.libraries.matrix.api.room.BaseRoom
 import io.element.android.libraries.matrix.api.room.alias.matches
 import io.element.android.libraries.matrix.api.room.joinedRoomMembers
+import io.element.android.libraries.matrix.api.roomlist.RoomListService
 import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.matrix.api.timeline.item.TimelineItemDebugInfo
 import io.element.android.libraries.matrix.ui.messages.RoomMemberProfilesCache
@@ -95,7 +96,8 @@ import kotlinx.parcelize.Parcelize
 class MessagesFlowNode(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
-    private val matrixClient: MatrixClient,
+    private val roomListService: RoomListService,
+    private val sessionId: SessionId,
     private val sendLocationEntryPoint: SendLocationEntryPoint,
     private val showLocationEntryPoint: ShowLocationEntryPoint,
     private val createPollEntryPoint: CreatePollEntryPoint,
@@ -194,7 +196,7 @@ class MessagesFlowNode(
             }
             .launchIn(lifecycleScope)
 
-        matrixClient.roomListService
+        roomListService
             .allRooms
             .summaries
             .onEach {
@@ -221,11 +223,13 @@ class MessagesFlowNode(
                     }
 
                     override fun onPreviewAttachments(attachments: ImmutableList<Attachment>, inReplyToEventId: EventId?) {
-                        backstack.push(NavTarget.AttachmentPreview(
-                            attachment = attachments.first(),
-                            timelineMode = Timeline.Mode.Live,
-                            inReplyToEventId = inReplyToEventId,
-                        ))
+                        backstack.push(
+                            NavTarget.AttachmentPreview(
+                                attachment = attachments.first(),
+                                timelineMode = Timeline.Mode.Live,
+                                inReplyToEventId = inReplyToEventId,
+                            )
+                        )
                     }
 
                     override fun onUserDataClick(userId: UserId) {
@@ -262,7 +266,7 @@ class MessagesFlowNode(
 
                     override fun onJoinCallClick(roomId: RoomId) {
                         val callType = CallType.RoomCall(
-                            sessionId = matrixClient.sessionId,
+                            sessionId = sessionId,
                             roomId = roomId,
                         )
                         analyticsService.captureInteraction(Interaction.Name.MobileRoomCallButton)
@@ -348,18 +352,20 @@ class MessagesFlowNode(
             }
             is NavTarget.CreatePoll -> {
                 createPollEntryPoint.nodeBuilder(this, buildContext)
-                    .params(CreatePollEntryPoint.Params(
-                        timelineMode = navTarget.timelineMode,
-                        mode = CreatePollMode.NewPoll
-                    ))
+                    .params(
+                        CreatePollEntryPoint.Params(
+                            timelineMode = navTarget.timelineMode,
+                            mode = CreatePollMode.NewPoll
+                        )
+                    )
                     .build()
             }
             is NavTarget.EditPoll -> {
                 createPollEntryPoint.nodeBuilder(this, buildContext)
                     .params(
                         CreatePollEntryPoint.Params(
-                        timelineMode = navTarget.timelineMode,
-                        mode = CreatePollMode.EditPoll(eventId = navTarget.eventId)
+                            timelineMode = navTarget.timelineMode,
+                            mode = CreatePollMode.EditPoll(eventId = navTarget.eventId)
                         )
                     )
                     .build()
@@ -412,11 +418,13 @@ class MessagesFlowNode(
                     }
 
                     override fun onPreviewAttachments(attachments: ImmutableList<Attachment>, inReplyToEventId: EventId?) {
-                        backstack.push(NavTarget.AttachmentPreview(
-                            attachment = attachments.first(),
-                            timelineMode = Timeline.Mode.Thread(navTarget.threadRootId),
-                            inReplyToEventId = inReplyToEventId,
-                        ))
+                        backstack.push(
+                            NavTarget.AttachmentPreview(
+                                attachment = attachments.first(),
+                                timelineMode = Timeline.Mode.Thread(navTarget.threadRootId),
+                                inReplyToEventId = inReplyToEventId,
+                            )
+                        )
                     }
 
                     override fun onUserDataClick(userId: UserId) {
@@ -453,7 +461,7 @@ class MessagesFlowNode(
 
                     override fun onJoinCallClick(roomId: RoomId) {
                         val callType = CallType.RoomCall(
-                            sessionId = matrixClient.sessionId,
+                            sessionId = sessionId,
                             roomId = roomId,
                         )
                         analyticsService.captureInteraction(Interaction.Name.MobileRoomCallButton)

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

@@ -30,9 +30,10 @@ import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.permalink.PermalinkData
 import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.matrix.test.AN_EVENT_ID
+import io.element.android.libraries.matrix.test.A_SESSION_ID
 import io.element.android.libraries.matrix.test.A_USER_ID
-import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.room.FakeBaseRoom
+import io.element.android.libraries.matrix.test.roomlist.FakeRoomListService
 import io.element.android.libraries.matrix.ui.messages.RoomMemberProfilesCache
 import io.element.android.libraries.matrix.ui.messages.RoomNamesCache
 import io.element.android.libraries.mediaviewer.api.MediaViewerEntryPoint
@@ -60,7 +61,8 @@ class DefaultMessagesEntryPointTest {
             MessagesFlowNode(
                 buildContext = buildContext,
                 plugins = plugins,
-                matrixClient = FakeMatrixClient(),
+                roomListService = FakeRoomListService(),
+                sessionId = A_SESSION_ID,
                 sendLocationEntryPoint = object : SendLocationEntryPoint {
                     override fun builder(timelineMode: Timeline.Mode) = lambdaError()
                 },

features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporter.kt

@@ -176,8 +176,8 @@ class DefaultBugReporter(
                     .addFormDataPart("branch_name", buildMeta.gitBranchName)
                 userId?.let {
                     matrixClientProvider.getOrNull(it)?.let { client ->
-                        val curveKey = client.encryptionService().deviceCurve25519()
-                        val edKey = client.encryptionService().deviceEd25519()
+                        val curveKey = client.encryptionService.deviceCurve25519()
+                        val edKey = client.encryptionService.deviceEd25519()
                         if (curveKey != null && edKey != null) {
                             builder.addFormDataPart("device_keys", "curve25519:$curveKey, ed25519:$edKey")
                         }

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

@@ -143,12 +143,12 @@ class RoomDetailsPresenter(
                 }
                 RoomDetailsEvent.MuteNotification -> {
                     scope.launch(dispatchers.io) {
-                        client.notificationSettingsService().muteRoom(room.roomId)
+                        notificationSettingsService.muteRoom(room.roomId)
                     }
                 }
                 RoomDetailsEvent.UnmuteNotification -> {
                     scope.launch(dispatchers.io) {
-                        client.notificationSettingsService().unmuteRoom(room.roomId, isEncrypted, room.isOneToOne)
+                        notificationSettingsService.unmuteRoom(room.roomId, isEncrypted, room.isOneToOne)
                     }
                 }
                 is RoomDetailsEvent.SetFavorite -> scope.setFavorite(event.isFavorite)

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

@@ -104,7 +104,7 @@ class RoomDetailsPresenterTest {
             client = matrixClient,
             room = room,
             featureFlagService = featureFlagService,
-            notificationSettingsService = matrixClient.notificationSettingsService(),
+            notificationSettingsService = matrixClient.notificationSettingsService,
             roomMembersDetailsPresenterFactory = roomMemberDetailsPresenterFactory,
             leaveRoomPresenter = { leaveRoomState },
             roomCallStatePresenter = { aStandByCallState() },

features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/ResetIdentityFlowManager.kt

@@ -10,7 +10,7 @@ package io.element.android.features.securebackup.impl.reset
 import dev.zacsweers.metro.Inject
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.di.annotations.SessionCoroutineScope
-import io.element.android.libraries.matrix.api.MatrixClient
+import io.element.android.libraries.matrix.api.encryption.EncryptionService
 import io.element.android.libraries.matrix.api.encryption.IdentityResetHandle
 import io.element.android.libraries.matrix.api.verification.SessionVerificationService
 import io.element.android.libraries.matrix.api.verification.SessionVerifiedStatus
@@ -24,7 +24,7 @@ import kotlinx.coroutines.launch
 
 @Inject
 class ResetIdentityFlowManager(
-    private val matrixClient: MatrixClient,
+    private val encryptionService: EncryptionService,
     @SessionCoroutineScope private val sessionCoroutineScope: CoroutineScope,
     private val sessionVerificationService: SessionVerificationService,
 ) {
@@ -46,7 +46,7 @@ class ResetIdentityFlowManager(
             resetHandleFlow.value = AsyncData.Loading()
 
             sessionCoroutineScope.launch {
-                matrixClient.encryptionService().startIdentityReset()
+                encryptionService.startIdentityReset()
                     .onSuccess { handle ->
                         resetHandleFlow.value = AsyncData.Success(handle)
                     }

features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/reset/ResetIdentityFlowManagerTest.kt

@@ -12,7 +12,6 @@ import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.matrix.api.encryption.IdentityResetHandle
 import io.element.android.libraries.matrix.api.verification.SessionVerifiedStatus
-import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.encryption.FakeEncryptionService
 import io.element.android.libraries.matrix.test.encryption.FakeIdentityPasswordResetHandle
 import io.element.android.libraries.matrix.test.verification.FakeSessionVerificationService
@@ -130,10 +129,9 @@ class ResetIdentityFlowManagerTest {
 
     private fun TestScope.createFlowManager(
         encryptionService: FakeEncryptionService = FakeEncryptionService(),
-        client: FakeMatrixClient = FakeMatrixClient(encryptionService = encryptionService),
         sessionVerificationService: FakeSessionVerificationService = FakeSessionVerificationService(),
     ) = ResetIdentityFlowManager(
-        matrixClient = client,
+        encryptionService = encryptionService,
         sessionCoroutineScope = this,
         sessionVerificationService = sessionVerificationService,
     )

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

@@ -32,8 +32,8 @@ import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.architecture.inputs
 import io.element.android.libraries.di.DependencyInjectionGraphOwner
 import io.element.android.libraries.di.SessionScope
-import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.spaces.SpaceService
 import kotlinx.parcelize.Parcelize
 
 @ContributesNode(SessionScope::class)
@@ -41,7 +41,7 @@ import kotlinx.parcelize.Parcelize
 class SpaceFlowNode(
     @Assisted val buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
-    matrixClient: MatrixClient,
+    spaceService: SpaceService,
     graphFactory: SpaceFlowGraph.Factory,
 ) : BaseFlowNode<SpaceFlowNode.NavTarget>(
     backstack = BackStack(
@@ -53,7 +53,7 @@ class SpaceFlowNode(
 ), DependencyInjectionGraphOwner {
     private val inputs: SpaceEntryPoint.Inputs = inputs()
     private val callback = plugins.filterIsInstance<SpaceEntryPoint.Callback>().single()
-    private val spaceRoomList = matrixClient.spaceService.spaceRoomList(inputs.roomId)
+    private val spaceRoomList = spaceService.spaceRoomList(inputs.roomId)
     override val graph = graphFactory.create(spaceRoomList)
 
     sealed interface NavTarget : Parcelable {

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

@@ -15,7 +15,6 @@ import io.element.android.features.space.api.SpaceEntryPoint
 import io.element.android.features.space.impl.di.FakeSpaceFlowGraph
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.test.A_ROOM_ID
-import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.spaces.FakeSpaceRoomList
 import io.element.android.libraries.matrix.test.spaces.FakeSpaceService
 import io.element.android.tests.testutils.lambda.lambdaError
@@ -38,10 +37,8 @@ class DefaultSpaceEntryPointTest {
             SpaceFlowNode(
                 buildContext = buildContext,
                 plugins = plugins,
-                matrixClient = FakeMatrixClient(
-                    spaceService = FakeSpaceService(
-                        spaceRoomListResult = { _: RoomId -> FakeSpaceRoomList(A_ROOM_ID) }
-                    )
+                spaceService = FakeSpaceService(
+                    spaceRoomListResult = { _: RoomId -> FakeSpaceRoomList(A_ROOM_ID) }
                 ),
                 graphFactory = FakeSpaceFlowGraph.Factory
             )