Merge pull request #67 from vector-im/feature/fga/fix_restoration

Feature/fga/fix restoration

app/build.gradle.kts

@@ -171,7 +171,7 @@ dependencies {
     // https://developer.android.com/studio/write/java8-support#library-desugaring-versions
     coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.2.2")
     implementation(libs.appyx.core)
-
+    implementation(libs.androidx.splash)
     implementation(libs.androidx.corektx)
     implementation(libs.androidx.lifecycle.runtime)
     implementation(libs.androidx.activity.compose)

app/src/main/AndroidManifest.xml

@@ -31,7 +31,8 @@
         tools:targetApi="33">
         <activity
             android:name=".MainActivity"
-            android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
+            android:theme="@style/Theme.ElementX.Splash"
+            android:configChanges="orientation|screenSize|screenLayout|keyboardHidden|uiMode"
             android:exported="true"
             android:windowSoftInputMode="adjustResize"
             tools:ignore="LockedOrientationActivity">

app/src/main/kotlin/io/element/android/x/MainActivity.kt

@@ -22,6 +22,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.ui.Modifier
+import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.WindowCompat
 import com.bumble.appyx.core.integration.NodeHost
 import com.bumble.appyx.core.integrationpoint.NodeComponentActivity
@@ -34,8 +35,10 @@ import io.element.android.x.node.RootFlowNode
 class MainActivity : NodeComponentActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        installSplashScreen()
         super.onCreate(savedInstanceState)
         val appBindings = bindings<AppBindings>()
+        appBindings.matrixClientsHolder().restore(savedInstanceState)
         WindowCompat.setDecorFitsSystemWindows(window, false)
         setContent {
             ElementXTheme {
@@ -48,11 +51,17 @@ class MainActivity : NodeComponentActivity() {
                             buildContext = it,
                             appComponentOwner = applicationContext as DaggerComponentOwner,
                             authenticationService = appBindings.authenticationService(),
-                            presenter = appBindings.rootPresenter()
+                            presenter = appBindings.rootPresenter(),
+                            matrixClientsHolder = appBindings.matrixClientsHolder()
                         )
                     }
                 }
             }
         }
     }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        bindings<AppBindings>().matrixClientsHolder().onSaveInstanceState(outState)
+    }
 }

app/src/main/kotlin/io/element/android/x/di/AppBindings.kt

@@ -24,7 +24,7 @@ import kotlinx.coroutines.CoroutineScope
 
 @ContributesTo(AppScope::class)
 interface AppBindings {
-    fun coroutineScope(): CoroutineScope
     fun rootPresenter(): RootPresenter
     fun authenticationService(): MatrixAuthenticationService
+    fun matrixClientsHolder(): MatrixClientsHolder
 }

app/src/main/kotlin/io/element/android/x/di/MatrixClientsHolder.kt

@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2023 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.x.di
+
+import android.os.Bundle
+import io.element.android.libraries.di.AppScope
+import io.element.android.libraries.di.SingleIn
+import io.element.android.libraries.matrix.MatrixClient
+import io.element.android.libraries.matrix.auth.MatrixAuthenticationService
+import io.element.android.libraries.matrix.core.SessionId
+import kotlinx.coroutines.runBlocking
+import timber.log.Timber
+import java.util.concurrent.ConcurrentHashMap
+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<SessionId, MatrixClient>()
+
+    fun add(matrixClient: MatrixClient) {
+        sessionIdsToMatrixClient[matrixClient.sessionId] = matrixClient
+    }
+
+    fun removeAll() {
+        sessionIdsToMatrixClient.clear()
+    }
+
+    fun remove(sessionId: SessionId) {
+        sessionIdsToMatrixClient.remove(sessionId)
+    }
+
+    fun isEmpty(): Boolean = sessionIdsToMatrixClient.isEmpty()
+
+    fun knowSession(sessionId: SessionId): Boolean = sessionIdsToMatrixClient.containsKey(sessionId)
+
+    fun getOrNull(sessionId: SessionId): MatrixClient? {
+        return sessionIdsToMatrixClient[sessionId]
+    }
+
+    @Suppress("DEPRECATION")
+    fun restore(savedInstanceState: Bundle?) {
+        if (savedInstanceState == null || sessionIdsToMatrixClient.isNotEmpty()) return
+        val sessionIds = savedInstanceState.getSerializable(SAVE_INSTANCE_KEY) as? Array<SessionId>
+        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 {
+            sessionIds.forEach { sessionId ->
+                Timber.v("Restore matrix session: $sessionId")
+                val matrixClient = authenticationService.restoreSession(sessionId)
+                if (matrixClient != null) {
+                    add(matrixClient)
+                }
+            }
+        }
+    }
+
+    fun onSaveInstanceState(outState: Bundle) {
+        val sessionKeys = sessionIdsToMatrixClient.keys.toTypedArray()
+        Timber.v("Save matrix session keys = $sessionKeys")
+        outState.putSerializable(SAVE_INSTANCE_KEY, sessionKeys)
+    }
+}

app/src/main/kotlin/io/element/android/x/node/BackstackExt.kt

@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2023 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.x.node
+
+import com.bumble.appyx.navmodel.backstack.BackStack
+import com.bumble.appyx.navmodel.backstack.operation.NewRoot
+
+/**
+ * Don't process NewRoot if the nav target already exists in the stack.
+ */
+fun <T : Any> BackStack<T>.safeRoot(element: T) {
+    val containsRoot = elements.value.any {
+        it.key.navTarget == element
+    }
+    if (containsRoot) return
+    accept(NewRoot(element))
+}

app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt

@@ -21,13 +21,10 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.lifecycle.lifecycleScope
 import com.bumble.appyx.core.composable.Children
-import com.bumble.appyx.core.lifecycle.subscribe
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.node.ParentNode
@@ -39,11 +36,10 @@ import com.bumble.appyx.navmodel.backstack.operation.push
 import io.element.android.features.rageshake.bugreport.BugReportNode
 import io.element.android.libraries.architecture.animation.rememberDefaultTransitionHandler
 import io.element.android.libraries.architecture.createNode
-import io.element.android.libraries.architecture.presenterConnector
 import io.element.android.libraries.di.DaggerComponentOwner
-import io.element.android.libraries.matrix.MatrixClient
 import io.element.android.libraries.matrix.auth.MatrixAuthenticationService
 import io.element.android.libraries.matrix.core.SessionId
+import io.element.android.x.di.MatrixClientsHolder
 import io.element.android.x.root.RootPresenter
 import io.element.android.x.root.RootView
 import kotlinx.coroutines.flow.distinctUntilChanged
@@ -51,61 +47,86 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.parcelize.Parcelize
 import timber.log.Timber
-import java.util.concurrent.ConcurrentHashMap
 
 class RootFlowNode(
-    buildContext: BuildContext,
+    private val buildContext: BuildContext,
     private val backstack: BackStack<NavTarget> = BackStack(
         initialElement = NavTarget.SplashScreen,
         savedStateMap = buildContext.savedStateMap,
     ),
     private val appComponentOwner: DaggerComponentOwner,
     private val authenticationService: MatrixAuthenticationService,
-    presenter: RootPresenter
+    private val matrixClientsHolder: MatrixClientsHolder,
+    private val presenter: RootPresenter
 ) :
     ParentNode<RootFlowNode.NavTarget>(
         navModel = backstack,
-        buildContext = buildContext,
+        buildContext = buildContext
     ),
 
     DaggerComponentOwner by appComponentOwner {
 
-    private val matrixClientsHolder = ConcurrentHashMap<SessionId, MatrixClient>()
-    private val presenterConnector = presenterConnector(presenter)
-
     override fun onBuilt() {
         super.onBuilt()
-        whenChildAttached(LoggedInFlowNode::class) { _, child ->
+        observeLoggedInState()
-            child.lifecycle.subscribe(
-                onDestroy = { matrixClientsHolder.remove(child.sessionId) }
-            )
     }
+
+    private fun observeLoggedInState() {
         authenticationService.isLoggedIn()
             .distinctUntilChanged()
             .onEach { isLoggedIn ->
                 Timber.v("isLoggedIn=$isLoggedIn")
                 if (isLoggedIn) {
-                    val matrixClient = authenticationService.restoreSession()
+                    tryToRestoreLatestSession(
-                    if (matrixClient == null) {
+                        onSuccess = { switchToLoggedInFlow(it) },
-                        backstack.newRoot(NavTarget.NotLoggedInFlow)
+                        onFailure = { switchToLogoutFlow() }
+                    )
                 } else {
-                        matrixClientsHolder[matrixClient.sessionId] = matrixClient
+                    switchToLogoutFlow()
-                        backstack.newRoot(NavTarget.LoggedInFlow(matrixClient.sessionId))
-                    }
-                } else {
-                    backstack.newRoot(NavTarget.NotLoggedInFlow)
                 }
             }
             .launchIn(lifecycleScope)
     }
 
+    private fun switchToLoggedInFlow(sessionId: SessionId) {
+        backstack.safeRoot(NavTarget.LoggedInFlow(sessionId = sessionId))
+    }
+
+    private fun switchToLogoutFlow() {
+        matrixClientsHolder.removeAll()
+        backstack.safeRoot(NavTarget.NotLoggedInFlow)
+    }
+
+    private suspend fun tryToRestoreLatestSession(
+        onSuccess: (SessionId) -> Unit = {},
+        onFailure: () -> Unit = {}
+    ) {
+        val latestKnownSessionId = authenticationService.getLatestSessionId()
+        if (latestKnownSessionId == null) {
+            onFailure()
+            return
+        }
+        if (matrixClientsHolder.knowSession(latestKnownSessionId)) {
+            onSuccess(latestKnownSessionId)
+            return
+        }
+        val matrixClient = authenticationService.restoreSession(latestKnownSessionId)
+        if (matrixClient == null) {
+            Timber.v("Failed to restore session...")
+            onFailure()
+        } else {
+            matrixClientsHolder.add(matrixClient)
+            onSuccess(matrixClient.sessionId)
+        }
+    }
+
     private fun onOpenBugReport() {
         backstack.push(NavTarget.BugReport)
     }
 
     @Composable
     override fun View(modifier: Modifier) {
-        val state by presenterConnector.stateFlow.collectAsState()
+        val state = presenter.present()
         RootView(
             state = state,
             modifier = modifier,
@@ -142,8 +163,10 @@ class RootFlowNode(
     override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
         return when (navTarget) {
             is NavTarget.LoggedInFlow -> {
-                val matrixClient =
+                val matrixClient = matrixClientsHolder.getOrNull(navTarget.sessionId) ?: return splashNode(buildContext).also {
-                    matrixClientsHolder[navTarget.sessionId] ?: throw IllegalStateException("Makes sure to give a matrixClient with the given sessionId")
+                    Timber.w("Couldn't find any session, go through SplashScreen")
+                    backstack.newRoot(NavTarget.SplashScreen)
+                }
                 LoggedInFlowNode(
                     buildContext = buildContext,
                     sessionId = navTarget.sessionId,
@@ -152,12 +175,14 @@ class RootFlowNode(
                 )
             }
             NavTarget.NotLoggedInFlow -> NotLoggedInFlowNode(buildContext)
-            NavTarget.SplashScreen -> node(buildContext) {
+            NavTarget.SplashScreen -> splashNode(buildContext)
+            NavTarget.BugReport -> createNode<BugReportNode>(buildContext, plugins = listOf(bugReportNodeCallback))
+        }
+    }
+
+    private fun splashNode(buildContext: BuildContext) = node(buildContext) {
         Box(modifier = it.fillMaxSize(), contentAlignment = Alignment.Center) {
             CircularProgressIndicator()
         }
     }
-            NavTarget.BugReport -> createNode<BugReportNode>(buildContext, plugins = listOf(bugReportNodeCallback))
-        }
-    }
 }

app/src/main/res/drawable/splash_icon.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<inset
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:drawable="@mipmap/ic_launcher_round"
+    android:insetTop="80dp"
+    android:insetRight="80dp"
+    android:insetBottom="80dp"
+    android:insetLeft="80dp" />

app/src/main/res/values-night/themes.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2023 New Vector Ltd
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<resources>
+
+    <style name="Theme.ElementX.Splash" parent="Theme.SplashScreen">
+        <item name="windowSplashScreenBackground">@color/black</item>
+        <item name="windowSplashScreenAnimatedIcon">@drawable/splash_icon</item>
+        <item name="postSplashScreenTheme">@style/Theme.ElementX</item>
+    </style>
+
+    <style name="Theme.ElementX" parent="Theme.ElementAndroid" />
+</resources>

app/src/main/res/values/themes.xml

@@ -16,6 +16,10 @@
   -->
 
 <resources>
-
+    <style name="Theme.ElementX.Splash" parent="Theme.SplashScreen.IconBackground">
+        <item name="windowSplashScreenBackground">@color/white</item>
+        <item name="windowSplashScreenAnimatedIcon">@drawable/splash_icon</item>
+        <item name="postSplashScreenTheme">@style/Theme.ElementX</item>
+    </style>
     <style name="Theme.ElementX" parent="Theme.ElementAndroid" />
 </resources>

features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerNode.kt

@@ -17,8 +17,6 @@
 package io.element.android.features.login.changeserver
 
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
@@ -26,25 +24,22 @@ import com.bumble.appyx.core.plugin.Plugin
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import io.element.android.anvilannotations.ContributesNode
-import io.element.android.libraries.architecture.presenterConnector
 import io.element.android.libraries.di.AppScope
 
 @ContributesNode(AppScope::class)
 class ChangeServerNode @AssistedInject constructor(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
-    presenter: ChangeServerPresenter,
+    private val presenter: ChangeServerPresenter,
 ) : Node(buildContext, plugins = plugins) {
 
-    private val presenterConnector = presenterConnector(presenter)
-
     private fun onSuccess() {
         navigateUp()
     }
 
     @Composable
     override fun View(modifier: Modifier) {
-        val state by presenterConnector.stateFlow.collectAsState()
+        val state = presenter.present()
         ChangeServerView(
             state = state,
             modifier = modifier,

features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootNode.kt

@@ -17,8 +17,6 @@
 package io.element.android.features.login.root
 
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.lifecycle.Lifecycle
 import com.bumble.appyx.core.modality.BuildContext
@@ -28,7 +26,6 @@ import com.bumble.appyx.core.plugin.plugins
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import io.element.android.anvilannotations.ContributesNode
-import io.element.android.libraries.architecture.presenterConnector
 import io.element.android.libraries.designsystem.utils.OnLifecycleEvent
 import io.element.android.libraries.di.AppScope
 
@@ -36,11 +33,9 @@ import io.element.android.libraries.di.AppScope
 class LoginRootNode @AssistedInject constructor(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
-    presenter: LoginRootPresenter,
+    private val presenter: LoginRootPresenter,
 ) : Node(buildContext, plugins = plugins) {
 
-    private val presenterConnector = presenterConnector(presenter)
-
     interface Callback : Plugin {
         fun onChangeHomeServer()
     }
@@ -51,7 +46,7 @@ class LoginRootNode @AssistedInject constructor(
 
     @Composable
     override fun View(modifier: Modifier) {
-        val state by presenterConnector.stateFlow.collectAsState()
+        val state = presenter.present()
         OnLifecycleEvent { _, event ->
             when (event) {
                 Lifecycle.Event.ON_RESUME -> state.eventSink(LoginRootEvents.RefreshHomeServer)

features/messages/src/main/kotlin/io/element/android/features/messages/MessagesNode.kt

@@ -17,8 +17,6 @@
 package io.element.android.features.messages
 
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
@@ -26,21 +24,18 @@ import com.bumble.appyx.core.plugin.Plugin
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import io.element.android.anvilannotations.ContributesNode
-import io.element.android.libraries.architecture.presenterConnector
 import io.element.android.libraries.di.RoomScope
 
 @ContributesNode(RoomScope::class)
 class MessagesNode @AssistedInject constructor(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
-    presenter: MessagesPresenter,
+    private val presenter: MessagesPresenter,
 ) : Node(buildContext, plugins = plugins) {
 
-    private val connector = presenterConnector(presenter)
-
     @Composable
     override fun View(modifier: Modifier) {
-        val state by connector.stateFlow.collectAsState()
+        val state = presenter.present()
         MessagesView(
             state = state,
             onBackPressed = this::navigateUp,

features/messages/src/main/kotlin/io/element/android/features/messages/MessagesPresenter.kt

@@ -36,9 +36,7 @@ import io.element.android.features.messages.timeline.model.content.TimelineItemT
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
-import io.element.android.libraries.matrix.MatrixClient
 import io.element.android.libraries.matrix.room.MatrixRoom
-import io.element.android.libraries.matrix.ui.MatrixItemHelper
 import io.element.android.libraries.textcomposer.MessageComposerMode
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
@@ -46,15 +44,12 @@ import timber.log.Timber
 import javax.inject.Inject
 
 class MessagesPresenter @Inject constructor(
-    private val matrixClient: MatrixClient,
     private val room: MatrixRoom,
     private val composerPresenter: MessageComposerPresenter,
     private val timelinePresenter: TimelinePresenter,
     private val actionListPresenter: ActionListPresenter,
 ) : Presenter<MessagesState> {
 
-    private val matrixItemHelper = MatrixItemHelper(matrixClient)
-
     @Composable
     override fun present(): MessagesState {
         val localCoroutineScope = rememberCoroutineScope()
@@ -71,8 +66,9 @@ class MessagesPresenter @Inject constructor(
         }
         LaunchedEffect(syncUpdateFlow) {
             roomAvatar.value =
-                matrixItemHelper.loadAvatarData(
+                AvatarData(
-                    room = room,
+                    name = room.bestName,
+                    url = room.avatarUrl,
                     size = AvatarSize.SMALL
                 )
             roomName.value = room.name

features/messages/src/main/kotlin/io/element/android/features/messages/textcomposer/MessageComposerPresenter.kt

@@ -20,6 +20,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.core.data.StableCharSequence
@@ -40,7 +41,7 @@ class MessageComposerPresenter @Inject constructor(
         val isFullScreen = rememberSaveable {
             mutableStateOf(false)
         }
-        val text: MutableState<StableCharSequence> = rememberSaveable {
+        val text: MutableState<StableCharSequence> = remember {
             mutableStateOf(StableCharSequence(""))
         }
         val composerMode: MutableState<MessageComposerMode> = rememberSaveable {

features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineItemsFactory.kt

@@ -32,6 +32,7 @@ import io.element.android.features.messages.timeline.model.content.TimelineItemR
 import io.element.android.features.messages.timeline.model.content.TimelineItemTextContent
 import io.element.android.features.messages.timeline.model.content.TimelineItemUnknownContent
 import io.element.android.features.messages.timeline.util.invalidateLast
+import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.matrix.core.EventId
 import io.element.android.libraries.matrix.media.MediaResolver
@@ -154,8 +155,7 @@ class TimelineItemsFactory @Inject constructor(
             computeGroupPosition(currentTimelineItem, timelineItems, index)
         val senderDisplayName = room.userDisplayName(currentSender).getOrNull()
         val senderAvatarUrl = room.userAvatarUrl(currentSender).getOrNull()
-        val senderAvatarData =
+        val senderAvatarData = AvatarData(
-            matrixItemHelper.loadAvatarData(
             name = senderDisplayName ?: currentSender,
             url = senderAvatarUrl,
             size = AvatarSize.SMALL

features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootNode.kt

@@ -17,8 +17,6 @@
 package io.element.android.features.preferences.root
 
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
@@ -27,29 +25,26 @@ import com.bumble.appyx.core.plugin.plugins
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import io.element.android.anvilannotations.ContributesNode
-import io.element.android.libraries.architecture.presenterConnector
 import io.element.android.libraries.di.SessionScope
 
 @ContributesNode(SessionScope::class)
 class PreferencesRootNode @AssistedInject constructor(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
-    presenter: PreferencesRootPresenter,
+    private val presenter: PreferencesRootPresenter,
 ) : Node(buildContext, plugins = plugins) {
 
     interface Callback : Plugin {
         fun onOpenBugReport()
     }
 
-    private val presenterConnector = presenterConnector(presenter)
-
     private fun onOpenBugReport() {
         plugins<Callback>().forEach { it.onOpenBugReport() }
     }
 
     @Composable
     override fun View(modifier: Modifier) {
-        val state by presenterConnector.stateFlow.collectAsState()
+        val state = presenter.present()
         PreferencesRootView(
             state = state,
             modifier = modifier,

features/rageshake/src/main/kotlin/io/element/android/features/rageshake/bugreport/BugReportNode.kt

@@ -17,8 +17,6 @@
 package io.element.android.features.rageshake.bugreport
 
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
@@ -27,25 +25,22 @@ import com.bumble.appyx.core.plugin.plugins
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import io.element.android.anvilannotations.ContributesNode
-import io.element.android.libraries.architecture.presenterConnector
 import io.element.android.libraries.di.AppScope
 
 @ContributesNode(AppScope::class)
 class BugReportNode @AssistedInject constructor(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
-    presenter: BugReportPresenter,
+    private val presenter: BugReportPresenter,
 ) : Node(buildContext, plugins = plugins) {
 
-    private val presenterConnector = presenterConnector(presenter)
-
     interface Callback : Plugin {
         fun onBugReportSent()
     }
 
     @Composable
     override fun View(modifier: Modifier) {
-        val state by presenterConnector.stateFlow.collectAsState()
+        val state = presenter.present()
         BugReportView(
             state = state,
             modifier = modifier,

features/roomlist/src/main/kotlin/io/element/android/features/roomlist/RoomListNode.kt

@@ -17,8 +17,6 @@
 package io.element.android.features.roomlist
 
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
@@ -27,7 +25,6 @@ import com.bumble.appyx.core.plugin.plugins
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import io.element.android.anvilannotations.ContributesNode
-import io.element.android.libraries.architecture.presenterConnector
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.core.RoomId
 
@@ -35,7 +32,7 @@ import io.element.android.libraries.matrix.core.RoomId
 class RoomListNode @AssistedInject constructor(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
-    presenter: RoomListPresenter,
+    private val presenter: RoomListPresenter,
 ) : Node(buildContext, plugins = plugins) {
 
     interface Callback : Plugin {
@@ -43,8 +40,6 @@ class RoomListNode @AssistedInject constructor(
         fun onSettingsClicked()
     }
 
-    private val connector = presenterConnector(presenter)
-
     private fun onRoomClicked(roomId: RoomId) {
         plugins<Callback>().forEach { it.onRoomClicked(roomId) }
     }
@@ -55,7 +50,7 @@ class RoomListNode @AssistedInject constructor(
 
     @Composable
     override fun View(modifier: Modifier) {
-        val state by connector.stateFlow.collectAsState()
+        val state = presenter.present()
         RoomListView(
             state = state,
             modifier = modifier,

features/roomlist/src/main/kotlin/io/element/android/features/roomlist/RoomListPresenter.kt

@@ -34,7 +34,6 @@ import io.element.android.libraries.core.coroutine.parallelMap
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.matrix.MatrixClient
-import io.element.android.libraries.matrix.media.MediaResolver
 import io.element.android.libraries.matrix.room.RoomSummary
 import io.element.android.libraries.matrix.ui.model.MatrixUser
 import kotlinx.collections.immutable.ImmutableList
@@ -42,6 +41,7 @@ import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
+import timber.log.Timber
 import javax.inject.Inject
 
 private const val extendedRangeSize = 40
@@ -61,7 +61,9 @@ class RoomListPresenter @Inject constructor(
         val roomSummaries by client
             .roomSummaryDataSource()
             .roomSummaries()
-            .collectAsState(initial = null)
+            .collectAsState()
+
+        Timber.v("RoomSummaries size = ${roomSummaries.size}")
 
         val filteredRoomSummaries: MutableState<ImmutableList<RoomListRoomSummary>> = remember {
             mutableStateOf(persistentListOf())
@@ -105,15 +107,14 @@ class RoomListPresenter @Inject constructor(
         val userAvatarUrl = client.loadUserAvatarURLString().getOrNull()
         val userDisplayName = client.loadUserDisplayName().getOrNull()
         val avatarData =
-            loadAvatarData(
+            AvatarData(
-                userDisplayName ?: client.userId().value,
+                name = userDisplayName ?: client.userId().value,
-                userAvatarUrl,
+                url = userAvatarUrl,
-                AvatarSize.SMALL
+                size = AvatarSize.SMALL
             )
         matrixUser.value = MatrixUser(
             id = client.userId(),
             username = userDisplayName ?: client.userId().value,
-            avatarUrl = userAvatarUrl,
             avatarData = avatarData,
         )
     }
@@ -135,9 +136,9 @@ class RoomListPresenter @Inject constructor(
             when (roomSummary) {
                 is RoomSummary.Empty -> RoomListRoomSummaryPlaceholders.create(roomSummary.identifier)
                 is RoomSummary.Filled -> {
-                    val avatarData = loadAvatarData(
+                    val avatarData = AvatarData(
-                        roomSummary.details.name,
+                        name = roomSummary.details.name,
-                        roomSummary.details.avatarURLString
+                        url = roomSummary.details.avatarURLString
                     )
                     RoomListRoomSummary(
                         id = roomSummary.identifier(),
@@ -151,14 +152,4 @@ class RoomListPresenter @Inject constructor(
             }
         }
     }
-
-    private suspend fun loadAvatarData(
-        name: String,
-        url: String?,
-        size: AvatarSize = AvatarSize.MEDIUM
-    ): AvatarData {
-        val model = client.mediaResolver()
-            .resolve(url, kind = MediaResolver.Kind.Thumbnail(size.value))
-        return AvatarData(name, model, size)
-    }
 }

features/template/src/main/kotlin/io/element/android/features/template/TemplateNode.kt

@@ -17,8 +17,6 @@
 package io.element.android.features.template
 
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
@@ -26,7 +24,6 @@ import com.bumble.appyx.core.plugin.Plugin
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import io.element.android.anvilannotations.ContributesNode
-import io.element.android.libraries.architecture.presenterConnector
 import io.element.android.libraries.di.AppScope
 
 // TODO Change to use the right Scope for your feature. For now it can be AppScope, SessionScope or RoomScope
@@ -34,14 +31,12 @@ import io.element.android.libraries.di.AppScope
 class TemplateNode @AssistedInject constructor(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
-    presenter: TemplatePresenter,
+    private val presenter: TemplatePresenter,
 ) : Node(buildContext, plugins = plugins) {
 
-    private val presenterConnector = presenterConnector(presenter)
-
     @Composable
     override fun View(modifier: Modifier) {
-        val state by presenterConnector.stateFlow.collectAsState()
+        val state = presenter.present()
         TemplateView(
             state = state,
             modifier = modifier

gradle/libs.versions.toml

@@ -37,7 +37,7 @@ datetime = "0.4.0"
 serialization_json = "1.4.1"
 showkase = "1.0.0-beta14"
 jsoup = "1.15.3"
-appyx = "1.0.1"
+appyx = "1.0.3"
 dependencycheck = "7.4.4"
 stem = "2.2.3"
 
@@ -66,6 +66,7 @@ androidx_recyclerview = { module = "androidx.recyclerview:recyclerview", version
 androidx_lifecycle_runtime = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle" }
 androidx_lifecycle_compose = { module = "androidx.lifecycle:compose", version.ref = "lifecycle" }
 androidx_lifecycle_process = { module = "androidx.lifecycle:lifecycle-process", version.ref = "lifecycle" }
+androidx_splash = "androidx.core:core-splashscreen:1.0.0"
 
 androidx_activity_compose = { module = "androidx.activity:activity-compose", version.ref = "activity_compose" }
 androidx_startup = { module = "androidx.startup:startup-runtime", version.ref = "startup" }

libraries/architecture/build.gradle.kts

@@ -28,6 +28,5 @@ dependencies {
     api(projects.libraries.di)
     api(libs.dagger)
     api(libs.appyx.core)
-    api(libs.molecule.runtime)
     api(libs.androidx.lifecycle.runtime)
 }

libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/PresenterConnector.kt

@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2023 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.element.android.libraries.architecture
-
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.lifecycleScope
-import app.cash.molecule.AndroidUiDispatcher
-import app.cash.molecule.RecompositionClock
-import app.cash.molecule.launchMolecule
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.StateFlow
-
-inline fun <reified State> LifecycleOwner.presenterConnector(presenter: Presenter<State>): LifecyclePresenterConnector<State> =
-    LifecyclePresenterConnector(lifecycleOwner = this, presenter = presenter)
-
-class LifecyclePresenterConnector<State>(lifecycleOwner: LifecycleOwner, presenter: Presenter<State>) {
-
-    private val moleculeScope = CoroutineScope(lifecycleOwner.lifecycleScope.coroutineContext + AndroidUiDispatcher.Main)
-
-    val stateFlow: StateFlow<State> = moleculeScope.launchMolecule(RecompositionClock.Immediate) {
-        presenter.present()
-    }
-}

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/Avatar.kt

@@ -41,7 +41,7 @@ fun Avatar(avatarData: AvatarData, modifier: Modifier = Modifier) {
     val commonModifier = modifier
         .size(avatarData.size.dp)
         .clip(CircleShape)
-    if (avatarData.model == null) {
+    if (avatarData.url == null) {
         InitialsAvatar(
             avatarData = avatarData,
             modifier = commonModifier,
@@ -60,7 +60,7 @@ private fun ImageAvatar(
     modifier: Modifier = Modifier,
 ) {
     AsyncImage(
-        model = avatarData.model,
+        model = avatarData,
         onError = {
             Timber.e("TAG", "Error $it\n${it.result}", it.result.throwable)
         },

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarData.kt

@@ -21,29 +21,6 @@ import androidx.compose.runtime.Immutable
 @Immutable
 data class AvatarData(
     val name: String = "",
-    val model: ByteArray? = null,
+    val url: String? = null,
     val size: AvatarSize = AvatarSize.MEDIUM
-) {
+)
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as AvatarData
-
-        if (name != other.name) return false
-        if (model != null) {
-            if (other.model == null) return false
-            if (!model.contentEquals(other.model)) return false
-        } else if (other.model != null) return false
-        if (size != other.size) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = name.hashCode()
-        result = 31 * result + (model?.contentHashCode() ?: 0)
-        result = 31 * result + size.value
-        return result
-    }
-}

libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/auth/MatrixAuthenticationService.kt

@@ -23,7 +23,7 @@ import kotlinx.coroutines.flow.Flow
 interface MatrixAuthenticationService {
     fun isLoggedIn(): Flow<Boolean>
     suspend fun getLatestSessionId(): SessionId?
-    suspend fun restoreSession(): MatrixClient?
+    suspend fun restoreSession(sessionId: SessionId): MatrixClient?
     fun getHomeserver(): String?
     fun getHomeserverOrDefault(): String
     suspend fun setHomeserver(homeserver: String)

libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/auth/RustMatrixAuthenticationService.kt

@@ -52,8 +52,8 @@ class RustMatrixAuthenticationService @Inject constructor(
         sessionStore.getLatestSession()?.sessionId()
     }
 
-    override suspend fun restoreSession() = withContext(coroutineDispatchers.io) {
+    override suspend fun restoreSession(sessionId: SessionId) = withContext(coroutineDispatchers.io) {
-        sessionStore.getLatestSession()
+        sessionStore.getSession(sessionId)
             ?.let { session ->
                 try {
                     ClientBuilder()

libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/media/MediaResolver.kt

@@ -29,7 +29,7 @@ interface MediaResolver {
     }
 
     data class Meta(
-        val source: MediaSource,
+        val source: MediaSource?,
         val kind: Kind
     )
 

libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/media/RustMediaResolver.kt

@@ -28,6 +28,7 @@ internal class RustMediaResolver(private val client: MatrixClient) : MediaResolv
     }
 
     override suspend fun resolve(meta: MediaResolver.Meta): ByteArray? {
+        if (meta.source == null) return null
         return when (meta.kind) {
             is MediaResolver.Kind.Content -> client.loadMediaContentForSource(meta.source)
             is MediaResolver.Kind.Thumbnail -> client.loadMediaThumbnailForSource(

libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomSummaryDataSource.kt

@@ -26,6 +26,7 @@ import kotlinx.coroutines.cancel
 import kotlinx.coroutines.cancelChildren
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.sample
@@ -43,7 +44,7 @@ import java.util.Collections
 import java.util.UUID
 
 interface RoomSummaryDataSource {
-    fun roomSummaries(): Flow<List<RoomSummary>>
+    fun roomSummaries(): StateFlow<List<RoomSummary>>
     fun setSlidingSyncRange(range: IntRange)
 }
 
@@ -98,9 +99,9 @@ internal class RustRoomSummaryDataSource(
         coroutineScope.cancel()
     }
 
-    @OptIn(FlowPreview::class)
+    //@OptIn(FlowPreview::class)
-    override fun roomSummaries(): Flow<List<RoomSummary>> {
+    override fun roomSummaries(): StateFlow<List<RoomSummary>> {
-        return roomSummaries.sample(50)
+        return roomSummaries
     }
 
     override fun setSlidingSyncRange(range: IntRange) {

libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/session/PreferencesSessionStore.kt

@@ -26,6 +26,7 @@ import com.squareup.anvil.annotations.ContributesBinding
 import io.element.android.libraries.di.AppScope
 import io.element.android.libraries.di.ApplicationContext
 import io.element.android.libraries.di.SingleIn
+import io.element.android.libraries.matrix.core.SessionId
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.map
@@ -94,6 +95,11 @@ class PreferencesSessionStore @Inject constructor(
         }
     }
 
+    override suspend fun getSession(sessionId: SessionId): Session? {
+        //TODO we should have a proper session management
+        return getLatestSession()
+    }
+
     override suspend fun reset() {
         store.edit { it.clear() }
     }

libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/session/SessionStore.kt

@@ -16,12 +16,14 @@
 
 package io.element.android.libraries.matrix.session
 
+import io.element.android.libraries.matrix.core.SessionId
 import kotlinx.coroutines.flow.Flow
 import org.matrix.rustcomponents.sdk.Session
 
 interface SessionStore {
     fun isLoggedIn(): Flow<Boolean>
     suspend fun storeData(session: Session)
+    suspend fun getSession(sessionId: SessionId): Session?
     suspend fun getLatestSession(): Session?
     suspend fun reset()
 }

libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/room/InMemoryRoomSummaryDataSource.kt

@@ -18,13 +18,13 @@ package io.element.android.libraries.matrixtest.room
 
 import io.element.android.libraries.matrix.room.RoomSummary
 import io.element.android.libraries.matrix.room.RoomSummaryDataSource
-import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.emptyFlow
+import kotlinx.coroutines.flow.StateFlow
 
 class InMemoryRoomSummaryDataSource : RoomSummaryDataSource {
 
-    override fun roomSummaries(): Flow<List<RoomSummary>> {
+    override fun roomSummaries(): StateFlow<List<RoomSummary>> {
-        return emptyFlow()
+        return MutableStateFlow(emptyList())
     }
 
     override fun setSlidingSyncRange(range: IntRange) = Unit

libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/MatrixItemHelper.kt

@@ -19,9 +19,6 @@ package io.element.android.libraries.matrix.ui
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.matrix.MatrixClient
-import io.element.android.libraries.matrix.media.MediaResolver
-import io.element.android.libraries.matrix.room.MatrixRoom
-import io.element.android.libraries.matrix.room.RoomSummary
 import io.element.android.libraries.matrix.ui.model.MatrixUser
 import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.flow.Flow
@@ -40,7 +37,7 @@ class MatrixItemHelper @Inject constructor(
             val userAvatarUrl = client.loadUserAvatarURLString().getOrNull()
             val userDisplayName = client.loadUserDisplayName().getOrNull()
             val avatarData =
-                loadAvatarData(
+                AvatarData(
                     userDisplayName ?: client.userId().value,
                     userAvatarUrl,
                     avatarSize
@@ -48,35 +45,8 @@ class MatrixItemHelper @Inject constructor(
             MatrixUser(
                 id = client.userId(),
                 username = userDisplayName,
-                avatarUrl = userAvatarUrl,
                 avatarData = avatarData,
             )
         }.asFlow()
     }
-
-    suspend fun loadAvatarData(room: MatrixRoom, size: AvatarSize): AvatarData {
-        return loadAvatarData(
-            name = room.bestName,
-            url = room.avatarUrl,
-            size = size
-        )
-    }
-
-    suspend fun loadAvatarData(roomSummary: RoomSummary.Filled, size: AvatarSize): AvatarData {
-        return loadAvatarData(
-            name = roomSummary.details.name,
-            url = roomSummary.details.avatarURLString,
-            size = size
-        )
-    }
-
-    suspend fun loadAvatarData(
-        name: String,
-        url: String?,
-        size: AvatarSize
-    ): AvatarData {
-        val model = client.mediaResolver()
-            .resolve(url, kind = MediaResolver.Kind.Thumbnail(size.value))
-        return AvatarData(name, model, size)
-    }
 }

libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserHeader.kt

@@ -87,7 +87,6 @@ fun MatrixUserHeaderPreview() {
         MatrixUser(
             id = UserId("@alice:server.org"),
             username = "Alice",
-            avatarUrl = null,
             avatarData = AvatarData("Alice")
         )
     )
@@ -100,7 +99,6 @@ fun MatrixUserHeaderNoUsernamePreview() {
         MatrixUser(
             id = UserId("@alice:server.org"),
             username = null,
-            avatarUrl = null,
             avatarData = AvatarData("Alice")
         )
     )

libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserRow.kt

@@ -91,7 +91,6 @@ fun MatrixUserRowPreview() {
         MatrixUser(
             id = UserId("@alice:server.org"),
             username = "Alice",
-            avatarUrl = null,
             avatarData = AvatarData("Alice")
         )
     )

libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/AvatarDataExt.kt

@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2023 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.libraries.matrix.ui.media
+
+import io.element.android.libraries.designsystem.components.avatar.AvatarData
+import io.element.android.libraries.matrix.media.MediaResolver
+import org.matrix.rustcomponents.sdk.mediaSourceFromUrl
+
+fun AvatarData.toMetadata(): MediaResolver.Meta {
+    val mediaSource = url?.let { mediaSourceFromUrl(it) }
+    return MediaResolver.Meta(source = mediaSource, kind = MediaResolver.Kind.Thumbnail(size.value))
+}

libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/ImageLoaderFactories.kt

@@ -31,8 +31,10 @@ class LoggedInImageLoaderFactory @Inject constructor(
         return ImageLoader
             .Builder(context)
             .components {
+                add(AvatarKeyer())
                 add(MediaKeyer())
-                add(MediaFetcher.Factory(matrixClient))
+                add(MediaFetcher.AvatarFactory(matrixClient))
+                add(MediaFetcher.MetaFactory(matrixClient))
             }
             .build()
     }

libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaFetcher.kt

@@ -20,6 +20,7 @@ import coil.ImageLoader
 import coil.fetch.FetchResult
 import coil.fetch.Fetcher
 import coil.request.Options
+import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.matrix.MatrixClient
 import io.element.android.libraries.matrix.media.MediaResolver
 import java.nio.ByteBuffer
@@ -37,7 +38,7 @@ internal class MediaFetcher(
         return imageLoader.components.newFetcher(byteBuffer, options, imageLoader)?.first?.fetch()
     }
 
-    class Factory(private val client: MatrixClient) :
+    class MetaFactory(private val client: MatrixClient) :
         Fetcher.Factory<MediaResolver.Meta> {
         override fun create(
             data: MediaResolver.Meta,
@@ -52,4 +53,20 @@ internal class MediaFetcher(
             )
         }
     }
+
+    class AvatarFactory(private val client: MatrixClient) :
+        Fetcher.Factory<AvatarData> {
+        override fun create(
+            data: AvatarData,
+            options: Options,
+            imageLoader: ImageLoader
+        ): Fetcher {
+            return MediaFetcher(
+                mediaResolver = client.mediaResolver(),
+                meta = data.toMetadata(),
+                options = options,
+                imageLoader = imageLoader
+            )
+        }
+    }
 }

libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaKeyer.kt

@@ -18,10 +18,19 @@ package io.element.android.libraries.matrix.ui.media
 
 import coil.key.Keyer
 import coil.request.Options
+import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.matrix.media.MediaResolver
 
+internal class AvatarKeyer : Keyer<AvatarData> {
+    override fun key(data: AvatarData, options: Options): String? {
+        return data.toMetadata().toKey()
+    }
+}
+
 internal class MediaKeyer : Keyer<MediaResolver.Meta> {
     override fun key(data: MediaResolver.Meta, options: Options): String? {
-        return "${data.source.url()}_${data.kind}"
+        return data.toKey()
     }
 }
+
+private fun MediaResolver.Meta.toKey() = "${source?.url()}_${kind}"

libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/MatrixUser.kt

@@ -24,7 +24,6 @@ import io.element.android.libraries.matrix.core.UserId
 data class MatrixUser(
     val id: UserId,
     val username: String? = null,
-    val avatarUrl: String? = null,
     val avatarData: AvatarData = AvatarData(),
 )