Let MatrixClient exposes val instead of fun for the services.

appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt

@@ -141,8 +141,8 @@ class LoggedInFlowNode(
     }
 
     private val loggedInFlowProcessor = LoggedInEventProcessor(
-        snackbarDispatcher,
-        matrixClient.roomMembershipObserver(),
+        snackbarDispatcher = snackbarDispatcher,
+        roomMembershipObserver = matrixClient.roomMembershipObserver,
     )
 
     private val verificationListener = object : SessionVerificationServiceListener {
@@ -189,7 +189,7 @@ class LoggedInFlowNode(
                 // TODO We do not support Space yet, so directly navigate to main space
                 appNavigationStateService.onNavigateToSpace(id, MAIN_SPACE)
                 loggedInFlowProcessor.observeEvents(sessionCoroutineScope)
-                matrixClient.sessionVerificationService().setListener(verificationListener)
+                matrixClient.sessionVerificationService.setListener(verificationListener)
                 mediaPreviewConfigMigration()
 
                 sessionCoroutineScope.launch {
@@ -218,7 +218,7 @@ class LoggedInFlowNode(
                 appNavigationStateService.onLeavingSpace(id)
                 appNavigationStateService.onLeavingSession(id)
                 loggedInFlowProcessor.stopObserving()
-                matrixClient.sessionVerificationService().setListener(null)
+                matrixClient.sessionVerificationService.setListener(null)
             }
         )
         setupSendingQueue()

appnav/src/main/kotlin/io/element/android/appnav/di/MatrixSessionCache.kt

@@ -109,7 +109,10 @@ class MatrixSessionCache(
     }
 
     private fun onNewMatrixClient(matrixClient: MatrixClient) {
-        val syncOrchestrator = syncOrchestratorFactory.create(matrixClient)
+        val syncOrchestrator = syncOrchestratorFactory.create(
+            syncService = matrixClient.syncService,
+            sessionCoroutineScope = matrixClient.sessionCoroutineScope,
+        )
         sessionIdsToMatrixSession[matrixClient.sessionId] = InMemoryMatrixSession(
             matrixClient = matrixClient,
             syncOrchestrator = syncOrchestrator,

appnav/src/main/kotlin/io/element/android/appnav/di/SyncOrchestrator.kt

@@ -15,9 +15,10 @@ import io.element.android.features.networkmonitor.api.NetworkMonitor
 import io.element.android.features.networkmonitor.api.NetworkStatus
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.core.coroutine.childScope
-import io.element.android.libraries.matrix.api.MatrixClient
+import io.element.android.libraries.matrix.api.sync.SyncService
 import io.element.android.libraries.matrix.api.sync.SyncState
 import io.element.android.services.appnavstate.api.AppForegroundStateService
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.debounce
@@ -32,21 +33,23 @@ import kotlin.time.Duration.Companion.seconds
 
 @AssistedInject
 class SyncOrchestrator(
-    @Assisted matrixClient: MatrixClient,
+    @Assisted private val syncService: SyncService,
+    @Assisted sessionCoroutineScope: CoroutineScope,
     private val appForegroundStateService: AppForegroundStateService,
     private val networkMonitor: NetworkMonitor,
     dispatchers: CoroutineDispatchers,
 ) {
     @AssistedFactory
     interface Factory {
-        fun create(matrixClient: MatrixClient): SyncOrchestrator
+        fun create(
+            syncService: SyncService,
+            sessionCoroutineScope: CoroutineScope,
+        ): SyncOrchestrator
     }
 
-    private val syncService = matrixClient.syncService()
-
     private val tag = "SyncOrchestrator"
 
-    private val coroutineScope = matrixClient.sessionCoroutineScope.childScope(dispatchers.io, tag)
+    private val coroutineScope = sessionCoroutineScope.childScope(dispatchers.io, tag)
 
     private val started = AtomicBoolean(false)
 

appnav/src/test/kotlin/io/element/android/appnav/SyncOrchestratorTest.kt

@@ -11,7 +11,6 @@ import io.element.android.appnav.di.SyncOrchestrator
 import io.element.android.features.networkmonitor.api.NetworkStatus
 import io.element.android.features.networkmonitor.test.FakeNetworkMonitor
 import io.element.android.libraries.matrix.api.sync.SyncState
-import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.sync.FakeSyncService
 import io.element.android.services.appnavstate.test.FakeAppForegroundStateService
 import io.element.android.tests.testutils.WarmUpRule
@@ -385,7 +384,8 @@ class SyncOrchestratorTest {
         networkMonitor: FakeNetworkMonitor = FakeNetworkMonitor(),
         appForegroundStateService: FakeAppForegroundStateService = FakeAppForegroundStateService(),
     ) = SyncOrchestrator(
-        matrixClient = FakeMatrixClient(syncService = syncService, sessionCoroutineScope = backgroundScope),
+        syncService = syncService,
+        sessionCoroutineScope = backgroundScope,
         networkMonitor = networkMonitor,
         appForegroundStateService = appForegroundStateService,
         dispatchers = testCoroutineDispatchers(),

appnav/src/test/kotlin/io/element/android/appnav/di/MatrixSessionCacheTest.kt

@@ -10,12 +10,13 @@ package io.element.android.appnav.di
 import com.bumble.appyx.core.state.MutableSavedStateMapImpl
 import com.google.common.truth.Truth.assertThat
 import io.element.android.features.networkmonitor.test.FakeNetworkMonitor
-import io.element.android.libraries.matrix.api.MatrixClient
+import io.element.android.libraries.matrix.api.sync.SyncService
 import io.element.android.libraries.matrix.test.A_SESSION_ID
 import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.auth.FakeMatrixAuthenticationService
 import io.element.android.services.appnavstate.test.FakeAppForegroundStateService
 import io.element.android.tests.testutils.testCoroutineDispatchers
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
@@ -117,9 +118,13 @@ class MatrixSessionCacheTest {
     }
 
     private fun TestScope.createSyncOrchestratorFactory() = object : SyncOrchestrator.Factory {
-        override fun create(matrixClient: MatrixClient): SyncOrchestrator {
+        override fun create(
+            syncService: SyncService,
+            sessionCoroutineScope: CoroutineScope,
+        ): SyncOrchestrator {
             return SyncOrchestrator(
-                matrixClient,
+                syncService = syncService,
+                sessionCoroutineScope = sessionCoroutineScope,
                 appForegroundStateService = FakeAppForegroundStateService(),
                 networkMonitor = FakeNetworkMonitor(),
                 dispatchers = testCoroutineDispatchers(),