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

Improve SignedOutPresenter.

Browse source 
We can now provide a SessionId in the Factory.
This commit is contained in:
Benoit Marty 2025-10-02 09:37:56 +02:00
parent 0f94ebc56e
commit ad9a6fec6f
3 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/SignedOutNode.kt
View file

@ -32,7 +32,7 @@ class SignedOutNode(
) : NodeInputs ) : NodeInputs
private val inputs: Inputs = inputs() private val inputs: Inputs = inputs()
private val presenter = presenterFactory.create(inputs.sessionId.value) private val presenter = presenterFactory.create(inputs.sessionId)
@Composable @Composable
override fun View(modifier: Modifier) { override fun View(modifier: Modifier) {

19
features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/SignedOutPresenter.kt
View file

@ -9,7 +9,6 @@ package io.element.android.features.signedout.impl
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.collectAsState import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.derivedStateOf
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.rememberCoroutineScope
@ -18,35 +17,35 @@ import dev.zacsweers.metro.AssistedFactory
import dev.zacsweers.metro.AssistedInject import dev.zacsweers.metro.AssistedInject
import io.element.android.libraries.architecture.Presenter import io.element.android.libraries.architecture.Presenter
import io.element.android.libraries.core.meta.BuildMeta import io.element.android.libraries.core.meta.BuildMeta
import io.element.android.libraries.matrix.api.core.SessionId
import io.element.android.libraries.sessionstorage.api.SessionStore import io.element.android.libraries.sessionstorage.api.SessionStore
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
@AssistedInject @AssistedInject
class SignedOutPresenter( class SignedOutPresenter(
// Cannot inject SessionId @Assisted private val sessionId: SessionId,
@Assisted private val sessionId: String,
private val sessionStore: SessionStore, private val sessionStore: SessionStore,
private val buildMeta: BuildMeta, private val buildMeta: BuildMeta,
) : Presenter<SignedOutState> { ) : Presenter<SignedOutState> {
@AssistedFactory @AssistedFactory
fun interface Factory { fun interface Factory {
fun create(sessionId: String): SignedOutPresenter fun create(sessionId: SessionId): SignedOutPresenter
} }
@Composable @Composable
override fun present(): SignedOutState { override fun present(): SignedOutState {
val sessions by remember {
sessionStore.sessionsFlow()
}.collectAsState(initial = emptyList())
val signedOutSession by remember { val signedOutSession by remember {
derivedStateOf { sessions.firstOrNull { it.userId == sessionId } } sessionStore.sessionsFlow().map { sessions ->
} sessions.firstOrNull { it.userId == sessionId.value }
}
}.collectAsState(initial = null)
val coroutineScope = rememberCoroutineScope() val coroutineScope = rememberCoroutineScope()
fun handleEvents(event: SignedOutEvents) { fun handleEvents(event: SignedOutEvents) {
when (event) { when (event) {
SignedOutEvents.SignInAgain -> coroutineScope.launch { SignedOutEvents.SignInAgain -> coroutineScope.launch {
sessionStore.removeSession(sessionId) sessionStore.removeSession(sessionId.value)
} }
} }
} }

2
features/signedout/impl/src/test/kotlin/io/element/android/features/signedout/impl/SignedOutPresenterTest.kt
View file

@ -70,7 +70,7 @@ internal fun createSignedOutPresenter(
sessionStore: SessionStore = InMemorySessionStore(), sessionStore: SessionStore = InMemorySessionStore(),
): SignedOutPresenter { ): SignedOutPresenter {
return SignedOutPresenter( return SignedOutPresenter(
sessionId = sessionId.value, sessionId = sessionId,
sessionStore = sessionStore, sessionStore = sessionStore,
buildMeta = aBuildMeta(applicationName = AN_APPLICATION_NAME), buildMeta = aBuildMeta(applicationName = AN_APPLICATION_NAME),
) )