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

Dagger: makes sure to not remove an active component when navigating

Browse source
This commit is contained in:
ganfra 2023-06-09 23:04:33 +02:00
parent ba44ff32c1
commit 3ba219c975
4 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
View file

@ -64,7 +64,6 @@ import io.element.android.services.analytics.api.AnalyticsService
import io.element.android.services.appnavstate.api.AppNavigationStateService
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.flowOf
import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach
import kotlinx.parcelize.Parcelize
@ -118,9 +117,9 @@ class LoggedInFlowNode @AssistedInject constructor(
}
interface LifecycleCallback : NodeLifecycleCallback {
fun onFlowCreated(client: MatrixClient) = Unit
fun onFlowCreated(identifier: String, client: MatrixClient) = Unit
fun onFlowReleased(client: MatrixClient) = Unit
fun onFlowReleased(identifier: String, client: MatrixClient) = Unit
}
data class Inputs(
@ -139,7 +138,7 @@ class LoggedInFlowNode @AssistedInject constructor(
observeAnalyticsState()
lifecycle.subscribe(
onCreate = {
plugins<LifecycleCallback>().forEach { it.onFlowCreated(inputs.matrixClient) }
plugins<LifecycleCallback>().forEach { it.onFlowCreated(id, inputs.matrixClient) }
val imageLoaderFactory = bindings<MatrixUIBindings>().loggedInImageLoaderFactory()
Coil.setImageLoader(imageLoaderFactory)
inputs.matrixClient.startSync()
@ -151,7 +150,7 @@ class LoggedInFlowNode @AssistedInject constructor(
onDestroy = {
val imageLoaderFactory = bindings<MatrixUIBindings>().notLoggedInImageLoaderFactory()
Coil.setImageLoader(imageLoaderFactory)
plugins<LifecycleCallback>().forEach { it.onFlowReleased(inputs.matrixClient) }
plugins<LifecycleCallback>().forEach { it.onFlowReleased(id, inputs.matrixClient) }
appNavigationStateService.onLeavingSpace(id)
appNavigationStateService.onLeavingSession(id)
loggedInFlowProcessor.stopObserving()

8
appnav/src/main/kotlin/io/element/android/appnav/RoomFlowNode.kt
View file

@ -68,8 +68,8 @@ class RoomFlowNode @AssistedInject constructor(
) {
interface LifecycleCallback : NodeLifecycleCallback {
fun onFlowCreated(room: MatrixRoom) = Unit
fun onFlowReleased(room: MatrixRoom) = Unit
fun onFlowCreated(owner: String, room: MatrixRoom) = Unit
fun onFlowReleased(owner: String, room: MatrixRoom) = Unit
}
data class Inputs(
@ -83,14 +83,14 @@ class RoomFlowNode @AssistedInject constructor(
lifecycle.subscribe(
onCreate = {
Timber.v("OnCreate")
plugins<LifecycleCallback>().forEach { it.onFlowCreated(inputs.room) }
plugins<LifecycleCallback>().forEach { it.onFlowCreated(id, inputs.room) }
appNavigationStateService.onNavigateToRoom(id, inputs.room.roomId)
fetchRoomMembers()
},
onDestroy = {
Timber.v("OnDestroy")
inputs.room.close()
plugins<LifecycleCallback>().forEach { it.onFlowReleased(inputs.room) }
plugins<LifecycleCallback>().forEach { it.onFlowReleased(id, inputs.room) }
appNavigationStateService.onLeavingRoom(id)
}
)