From a9720e36c1c5895007b3e73bd7d470d84b326c19 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 12 Jul 2023 12:23:46 +0200 Subject: [PATCH] Let RootFlowNode manage MatrixClientsHolder save and restoration. --- .../io/element/android/x/MainActivity.kt | 8 +---- .../io/element/android/x/di/AppBindings.kt | 2 -- .../io/element/android/appnav/RootFlowNode.kt | 7 +++++ .../android/appnav/di/MatrixClientsHolder.kt | 31 +++++++++---------- 4 files changed, 23 insertions(+), 25 deletions(-) diff --git a/app/src/main/kotlin/io/element/android/x/MainActivity.kt b/app/src/main/kotlin/io/element/android/x/MainActivity.kt index be9f6134ba..cf37b22159 100644 --- a/app/src/main/kotlin/io/element/android/x/MainActivity.kt +++ b/app/src/main/kotlin/io/element/android/x/MainActivity.kt @@ -52,8 +52,7 @@ class MainActivity : NodeComponentActivity() { Timber.tag(loggerTag.value).w("onCreate, with savedInstanceState: ${savedInstanceState != null}") installSplashScreen() super.onCreate(savedInstanceState) - appBindings = bindings() - appBindings.matrixClientsHolder().restore(savedInstanceState) + appBindings = bindings() WindowCompat.setDecorFitsSystemWindows(window, false) setContent { MainContent(appBindings) @@ -125,9 +124,4 @@ class MainActivity : NodeComponentActivity() { super.onDestroy() Timber.tag(loggerTag.value).w("onDestroy") } - - override fun onSaveInstanceState(outState: Bundle) { - super.onSaveInstanceState(outState) - bindings().matrixClientsHolder().onSaveInstanceState(outState) - } } diff --git a/app/src/main/kotlin/io/element/android/x/di/AppBindings.kt b/app/src/main/kotlin/io/element/android/x/di/AppBindings.kt index 59f7e98d20..4d75d8601e 100644 --- a/app/src/main/kotlin/io/element/android/x/di/AppBindings.kt +++ b/app/src/main/kotlin/io/element/android/x/di/AppBindings.kt @@ -17,13 +17,11 @@ package io.element.android.x.di import com.squareup.anvil.annotations.ContributesTo -import io.element.android.appnav.di.MatrixClientsHolder import io.element.android.libraries.designsystem.utils.SnackbarDispatcher import io.element.android.libraries.di.AppScope @ContributesTo(AppScope::class) interface AppBindings { - fun matrixClientsHolder(): MatrixClientsHolder fun mainDaggerComponentOwner(): MainDaggerComponentsOwner fun snackbarDispatcher(): SnackbarDispatcher } diff --git a/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt index 8803d574d9..4150bcaebc 100644 --- a/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt +++ b/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt @@ -30,6 +30,7 @@ import com.bumble.appyx.core.node.Node import com.bumble.appyx.core.node.node import com.bumble.appyx.core.plugin.Plugin import com.bumble.appyx.core.plugin.plugins +import com.bumble.appyx.core.state.MutableSavedStateMap import com.bumble.appyx.navmodel.backstack.BackStack import com.bumble.appyx.navmodel.backstack.operation.pop import com.bumble.appyx.navmodel.backstack.operation.push @@ -90,10 +91,16 @@ class RootFlowNode @AssistedInject constructor( ) { override fun onBuilt() { + matrixClientsHolder.restore(buildContext.savedStateMap) super.onBuilt() observeLoggedInState() } + override fun onSaveInstanceState(state: MutableSavedStateMap) { + super.onSaveInstanceState(state) + matrixClientsHolder.save(state) + } + private fun observeLoggedInState() { combine( cacheService.onClearedCacheEventFlow(), diff --git a/appnav/src/main/kotlin/io/element/android/appnav/di/MatrixClientsHolder.kt b/appnav/src/main/kotlin/io/element/android/appnav/di/MatrixClientsHolder.kt index 092cffd630..24c082627f 100644 --- a/appnav/src/main/kotlin/io/element/android/appnav/di/MatrixClientsHolder.kt +++ b/appnav/src/main/kotlin/io/element/android/appnav/di/MatrixClientsHolder.kt @@ -16,13 +16,11 @@ package io.element.android.appnav.di -import android.os.Bundle -import io.element.android.libraries.di.AppScope -import io.element.android.libraries.di.SingleIn +import com.bumble.appyx.core.state.MutableSavedStateMap +import com.bumble.appyx.core.state.SavedStateMap import io.element.android.libraries.matrix.api.MatrixClient import io.element.android.libraries.matrix.api.auth.MatrixAuthenticationService import io.element.android.libraries.matrix.api.core.SessionId -import io.element.android.libraries.matrix.api.core.UserId import kotlinx.coroutines.runBlocking import timber.log.Timber import java.util.concurrent.ConcurrentHashMap @@ -30,7 +28,6 @@ import javax.inject.Inject private const val SAVE_INSTANCE_KEY = "io.element.android.x.di.MatrixClientsHolder.SaveInstanceKey" -@SingleIn(AppScope::class) class MatrixClientsHolder @Inject constructor(private val authenticationService: MatrixAuthenticationService) { private val sessionIdsToMatrixClient = ConcurrentHashMap() @@ -55,16 +52,18 @@ class MatrixClientsHolder @Inject constructor(private val authenticationService: return sessionIdsToMatrixClient[sessionId] } - @Suppress("DEPRECATION") - fun restore(savedInstanceState: Bundle?) { - if (savedInstanceState == null || sessionIdsToMatrixClient.isNotEmpty()) return - val userIds = savedInstanceState.getSerializable(SAVE_INSTANCE_KEY) as? Array - if (userIds.isNullOrEmpty()) return + @Suppress("UNCHECKED_CAST") + fun restore(state: SavedStateMap?) { + if (state == null || sessionIdsToMatrixClient.isNotEmpty()) return Unit.also { + Timber.w("Restore with non-empty map") + } + val sessionIds = state[SAVE_INSTANCE_KEY] as? Array + if (sessionIds.isNullOrEmpty()) return // Not ideal but should only happens in case of process recreation. This ensure we restore all the active sessions before restoring the node graphs. runBlocking { - userIds.forEach { userId -> - Timber.v("Restore matrix session: $userId") - authenticationService.restoreSession(userId) + sessionIds.forEach { sessionId -> + Timber.d("Restore matrix session: $sessionId") + authenticationService.restoreSession(sessionId) .onSuccess { matrixClient -> add(matrixClient) } @@ -75,9 +74,9 @@ class MatrixClientsHolder @Inject constructor(private val authenticationService: } } - fun onSaveInstanceState(outState: Bundle) { + fun save(state: MutableSavedStateMap) { val sessionKeys = sessionIdsToMatrixClient.keys.toTypedArray() - Timber.v("Save matrix session keys = $sessionKeys") - outState.putSerializable(SAVE_INSTANCE_KEY, sessionKeys) + Timber.d("Save matrix session keys = $sessionKeys") + state[SAVE_INSTANCE_KEY] = sessionKeys } }