Sulkta-OSS/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move cache management to a dedicated class and in the setting module, for clarity.

Browse source
This commit is contained in:
Benoit Marty 2023-06-23 15:38:04 +02:00 • committed by Benoit Marty
parent cc1c3c8f7b
commit b6920afb7f
7 changed files with 74 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

6
appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt
View file

@ -44,6 +44,7 @@ import io.element.android.appnav.root.RootPresenter
import io.element.android.appnav.root.RootView
import io.element.android.features.login.api.oidc.OidcAction
import io.element.android.features.login.api.oidc.OidcActionFlow
import io.element.android.features.preferences.api.CacheService
import io.element.android.features.rageshake.api.bugreport.BugReportEntryPoint
import io.element.android.libraries.architecture.BackstackNode
import io.element.android.libraries.architecture.animation.rememberDefaultTransitionHandler
@ -67,6 +68,7 @@ class RootFlowNode @AssistedInject constructor(
@Assisted val buildContext: BuildContext,
@Assisted plugins: List<Plugin>,
private val authenticationService: MatrixAuthenticationService,
private val cacheService: CacheService,
private val matrixClientsHolder: MatrixClientsHolder,
private val presenter: RootPresenter,
private val bugReportEntryPoint: BugReportEntryPoint,
@ -91,7 +93,7 @@ class RootFlowNode @AssistedInject constructor(
authenticationService.isLoggedIn()
.distinctUntilChanged()
.combine(
authenticationService.cacheIndex().onEach {
cacheService.cacheIndex().onEach {
Timber.v("cacheIndex=$it")
matrixClientsHolder.removeAll()
}
@ -245,7 +247,7 @@ class RootFlowNode @AssistedInject constructor(
}
private suspend fun attachSession(sessionId: SessionId): LoggedInFlowNode {
val cacheIndex = authenticationService.cacheIndex().first()
val cacheIndex = cacheService.cacheIndex().first()
return attachChild {
backstack.newRoot(NavTarget.LoggedInFlow(sessionId, cacheIndex))
}