Remove SyncOrchestrator interface, rename DefaultSyncOrchestrator to it, remove the existing provider interface.

Author: jmartinesp

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

@@ -7,6 +7,7 @@
 
 package io.element.android.appnav.di
 
+import androidx.annotation.VisibleForTesting
 import com.bumble.appyx.core.state.MutableSavedStateMap
 import com.bumble.appyx.core.state.SavedStateMap
 import com.squareup.anvil.annotations.ContributesBinding
@@ -16,8 +17,6 @@ import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.MatrixClientProvider
 import io.element.android.libraries.matrix.api.auth.MatrixAuthenticationService
 import io.element.android.libraries.matrix.api.core.SessionId
-import io.element.android.services.appnavstate.api.SyncOrchestrator
-import io.element.android.services.appnavstate.api.SyncOrchestratorProvider
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
@@ -34,11 +33,10 @@ private const val SAVE_INSTANCE_KEY = "io.element.android.x.di.MatrixClientsHold
  */
 @SingleIn(AppScope::class)
 @ContributesBinding(AppScope::class, boundType = MatrixClientProvider::class)
-@ContributesBinding(AppScope::class, boundType = SyncOrchestratorProvider::class)
 class MatrixSessionCache @Inject constructor(
     private val authenticationService: MatrixAuthenticationService,
-    private val syncOrchestratorFactory: DefaultSyncOrchestrator.Factory,
-) : MatrixClientProvider, SyncOrchestratorProvider {
+    private val syncOrchestratorFactory: SyncOrchestrator.Factory,
+) : MatrixClientProvider {
     private val sessionIdsToMatrixSession = ConcurrentHashMap<SessionId, InMemoryMatrixSession>()
     private val restoreMutex = Mutex()
 
@@ -74,7 +72,8 @@ class MatrixSessionCache @Inject constructor(
         }
     }
 
-    override fun getSyncOrchestrator(sessionId: SessionId): SyncOrchestrator? {
+    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    internal fun getSyncOrchestrator(sessionId: SessionId): SyncOrchestrator? {
         return sessionIdsToMatrixSession[sessionId]?.syncOrchestrator
     }
 

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

@@ -16,7 +16,6 @@ import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.sync.SyncState
 import io.element.android.services.appnavstate.api.AppForegroundStateService
-import io.element.android.services.appnavstate.api.SyncOrchestrator
 import kotlinx.coroutines.CoroutineName
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.FlowPreview
@@ -30,16 +29,16 @@ import java.util.concurrent.atomic.AtomicBoolean
 import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Duration.Companion.seconds
 
-class DefaultSyncOrchestrator @AssistedInject constructor(
+class SyncOrchestrator @AssistedInject constructor(
     @Assisted matrixClient: MatrixClient,
     sessionCoroutineScope: CoroutineScope = matrixClient.sessionCoroutineScope,
     private val appForegroundStateService: AppForegroundStateService,
     private val networkMonitor: NetworkMonitor,
     dispatchers: CoroutineDispatchers,
-) : SyncOrchestrator {
+) {
     @AssistedFactory
     interface Factory {
-        fun create(matrixClient: MatrixClient): DefaultSyncOrchestrator
+        fun create(matrixClient: MatrixClient): SyncOrchestrator
     }
 
     private val syncService = matrixClient.syncService()
@@ -56,7 +55,7 @@ class DefaultSyncOrchestrator @AssistedInject constructor(
      * Before observing the state, a first attempt at starting the sync service will happen if it's not already running.
      */
     @OptIn(FlowPreview::class)
-    override fun start() {
+    fun start() {
         if (!started.compareAndSet(false, true)) {
             Timber.tag(tag).d("already started, exiting early")
             return

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

@@ -7,7 +7,7 @@
 
 package io.element.android.appnav
 
-import io.element.android.appnav.di.DefaultSyncOrchestrator
+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
@@ -30,7 +30,7 @@ import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Duration.Companion.seconds
 
 @OptIn(ExperimentalCoroutinesApi::class)
-class DefaultSyncOrchestratorTest {
+class SyncOrchestratorTest {
     @get:Rule
     val warmUpRule = WarmUpRule()
 
@@ -302,7 +302,7 @@ class DefaultSyncOrchestratorTest {
         networkMonitor: FakeNetworkMonitor = FakeNetworkMonitor(),
         appForegroundStateService: FakeAppForegroundStateService = FakeAppForegroundStateService(),
         baseCoroutineScope: CoroutineScope = CoroutineScope(coroutineContext + SupervisorJob()),
-    ) = DefaultSyncOrchestrator(
+    ) = SyncOrchestrator(
         matrixClient = FakeMatrixClient(syncService = syncService),
         networkMonitor = networkMonitor,
         appForegroundStateService = appForegroundStateService,

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

@@ -141,9 +141,9 @@ class MatrixSessionCacheTest {
 
     private fun TestScope.createSyncOrchestratorFactory(
         baseCoroutineScope: CoroutineScope = this,
-    ) = object : DefaultSyncOrchestrator.Factory {
-        override fun create(matrixClient: MatrixClient): DefaultSyncOrchestrator {
-            return DefaultSyncOrchestrator(
+    ) = object : SyncOrchestrator.Factory {
+        override fun create(matrixClient: MatrixClient): SyncOrchestrator {
+            return SyncOrchestrator(
                 matrixClient,
                 sessionCoroutineScope = baseCoroutineScope,
                 appForegroundStateService = FakeAppForegroundStateService(),