From 8d476b5f98924044190af63b5c1a25b31eb47c97 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 2 Oct 2025 09:37:56 +0200
Subject: [PATCH] Improve SignedOutPresenter. We can now provide a SessionId in
 the Factory.

---
 .../features/signedout/impl/SignedOutNode.kt  |  2 +-
 .../signedout/impl/SignedOutPresenter.kt      | 19 +++++++++----------
 .../signedout/impl/SignedOutPresenterTest.kt  |  2 +-
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/SignedOutNode.kt b/features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/SignedOutNode.kt
index 1a9505282e..1bacc78932 100644
--- a/features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/SignedOutNode.kt
+++ b/features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/SignedOutNode.kt
@@ -32,7 +32,7 @@ class SignedOutNode(
     ) : NodeInputs
 
     private val inputs: Inputs = inputs()
-    private val presenter = presenterFactory.create(inputs.sessionId.value)
+    private val presenter = presenterFactory.create(inputs.sessionId)
 
     @Composable
     override fun View(modifier: Modifier) {
diff --git a/features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/SignedOutPresenter.kt b/features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/SignedOutPresenter.kt
index 4680b4c7ec..7c9d1e6d83 100644
--- a/features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/SignedOutPresenter.kt
+++ b/features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/SignedOutPresenter.kt
@@ -9,7 +9,6 @@ package io.element.android.features.signedout.impl
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
@@ -18,35 +17,35 @@ import dev.zacsweers.metro.AssistedFactory
 import dev.zacsweers.metro.AssistedInject
 import io.element.android.libraries.architecture.Presenter
 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 kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 
 @AssistedInject
 class SignedOutPresenter(
-    // Cannot inject SessionId
-    @Assisted private val sessionId: String,
+    @Assisted private val sessionId: SessionId,
     private val sessionStore: SessionStore,
     private val buildMeta: BuildMeta,
 ) : Presenter<SignedOutState> {
     @AssistedFactory
     fun interface Factory {
-        fun create(sessionId: String): SignedOutPresenter
+        fun create(sessionId: SessionId): SignedOutPresenter
     }
 
     @Composable
     override fun present(): SignedOutState {
-        val sessions by remember {
-            sessionStore.sessionsFlow()
-        }.collectAsState(initial = emptyList())
         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()
 
         fun handleEvents(event: SignedOutEvents) {
             when (event) {
                 SignedOutEvents.SignInAgain -> coroutineScope.launch {
-                    sessionStore.removeSession(sessionId)
+                    sessionStore.removeSession(sessionId.value)
                 }
             }
         }
diff --git a/features/signedout/impl/src/test/kotlin/io/element/android/features/signedout/impl/SignedOutPresenterTest.kt b/features/signedout/impl/src/test/kotlin/io/element/android/features/signedout/impl/SignedOutPresenterTest.kt
index de5634f269..e53c0af112 100644
--- a/features/signedout/impl/src/test/kotlin/io/element/android/features/signedout/impl/SignedOutPresenterTest.kt
+++ b/features/signedout/impl/src/test/kotlin/io/element/android/features/signedout/impl/SignedOutPresenterTest.kt
@@ -70,7 +70,7 @@ internal fun createSignedOutPresenter(
     sessionStore: SessionStore = InMemorySessionStore(),
 ): SignedOutPresenter {
     return SignedOutPresenter(
-        sessionId = sessionId.value,
+        sessionId = sessionId,
         sessionStore = sessionStore,
         buildMeta = aBuildMeta(applicationName = AN_APPLICATION_NAME),
     )