Merge branch 'develop' into fix/1270-verification-request-timeout

features/analytics/api/src/main/kotlin/io/element/android/features/analytics/api/AnalyticsOptInEvent.kt

@@ -8,6 +8,6 @@
 
 package io.element.android.features.analytics.api
 
-sealed interface AnalyticsOptInEvents {
-    data class EnableAnalytics(val isEnabled: Boolean) : AnalyticsOptInEvents
+sealed interface AnalyticsOptInEvent {
+    data class EnableAnalytics(val isEnabled: Boolean) : AnalyticsOptInEvent
 }

features/analytics/api/src/main/kotlin/io/element/android/features/analytics/api/preferences/AnalyticsPreferencesState.kt

@@ -8,11 +8,11 @@
 
 package io.element.android.features.analytics.api.preferences
 
-import io.element.android.features.analytics.api.AnalyticsOptInEvents
+import io.element.android.features.analytics.api.AnalyticsOptInEvent
 
 data class AnalyticsPreferencesState(
     val applicationName: String,
     val isEnabled: Boolean,
     val policyUrl: String,
-    val eventSink: (AnalyticsOptInEvents) -> Unit,
+    val eventSink: (AnalyticsOptInEvent) -> Unit,
 )

features/analytics/api/src/main/kotlin/io/element/android/features/analytics/api/preferences/AnalyticsPreferencesStatePreviewParam.kt

@@ -10,7 +10,7 @@ package io.element.android.features.analytics.api.preferences
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 
-open class AnalyticsPreferencesStateProvider : PreviewParameterProvider<AnalyticsPreferencesState> {
+open class AnalyticsPreferencesStatePreviewParam : PreviewParameterProvider<AnalyticsPreferencesState> {
     override val values: Sequence<AnalyticsPreferencesState>
         get() = sequenceOf(
             aAnalyticsPreferencesState().copy(isEnabled = true),

features/analytics/api/src/main/kotlin/io/element/android/features/analytics/api/preferences/AnalyticsPreferencesView.kt

@@ -13,7 +13,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.PreviewParameter
-import io.element.android.features.analytics.api.AnalyticsOptInEvents
+import io.element.android.features.analytics.api.AnalyticsOptInEvent
 import io.element.android.features.analytics.api.R
 import io.element.android.libraries.designsystem.components.LINK_TAG
 import io.element.android.libraries.designsystem.components.list.ListItemContent
@@ -30,7 +30,7 @@ fun AnalyticsPreferencesView(
     modifier: Modifier = Modifier,
 ) {
     fun onEnabledChanged(isEnabled: Boolean) {
-        state.eventSink(AnalyticsOptInEvents.EnableAnalytics(isEnabled = isEnabled))
+        state.eventSink(AnalyticsOptInEvent.EnableAnalytics(isEnabled = isEnabled))
     }
 
     val supportingText = stringResource(
@@ -66,7 +66,7 @@ fun AnalyticsPreferencesView(
 
 @PreviewsDayNight
 @Composable
-internal fun AnalyticsPreferencesViewPreview(@PreviewParameter(AnalyticsPreferencesStateProvider::class) state: AnalyticsPreferencesState) =
+internal fun AnalyticsPreferencesViewPreview(@PreviewParameter(AnalyticsPreferencesStatePreviewParam::class) state: AnalyticsPreferencesState) =
     ElementPreview {
         AnalyticsPreferencesView(
             state = state,

features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInPresenter.kt

@@ -12,7 +12,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
 import dev.zacsweers.metro.Inject
 import io.element.android.appconfig.AnalyticsConfig
-import io.element.android.features.analytics.api.AnalyticsOptInEvents
+import io.element.android.features.analytics.api.AnalyticsOptInEvent
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.core.meta.BuildMeta
 import io.element.android.services.analytics.api.AnalyticsService
@@ -28,9 +28,9 @@ class AnalyticsOptInPresenter(
     override fun present(): AnalyticsOptInState {
         val localCoroutineScope = rememberCoroutineScope()
 
-        fun handleEvent(event: AnalyticsOptInEvents) {
+        fun handleEvent(event: AnalyticsOptInEvent) {
             when (event) {
-                is AnalyticsOptInEvents.EnableAnalytics -> localCoroutineScope.setIsEnabled(event.isEnabled)
+                is AnalyticsOptInEvent.EnableAnalytics -> localCoroutineScope.setIsEnabled(event.isEnabled)
             }
             localCoroutineScope.launch {
                 analyticsService.setDidAskUserConsent()

features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInState.kt

@@ -8,10 +8,10 @@
 
 package io.element.android.features.analytics.impl
 
-import io.element.android.features.analytics.api.AnalyticsOptInEvents
+import io.element.android.features.analytics.api.AnalyticsOptInEvent
 
 data class AnalyticsOptInState(
     val applicationName: String,
     val hasPolicyLink: Boolean,
-    val eventSink: (AnalyticsOptInEvents) -> Unit
+    val eventSink: (AnalyticsOptInEvent) -> Unit
 )

features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInStatePreviewParam.kt

@@ -10,7 +10,7 @@ package io.element.android.features.analytics.impl
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 
-open class AnalyticsOptInStateProvider : PreviewParameterProvider<AnalyticsOptInState> {
+open class AnalyticsOptInStatePreviewParam : PreviewParameterProvider<AnalyticsOptInState> {
     override val values: Sequence<AnalyticsOptInState>
         get() = sequenceOf(
             aAnalyticsOptInState(),

features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInView.kt

@@ -28,7 +28,7 @@ import androidx.compose.ui.unit.dp
 import io.element.android.appconfig.AnalyticsConfig
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.CompoundIcons
-import io.element.android.features.analytics.api.AnalyticsOptInEvents
+import io.element.android.features.analytics.api.AnalyticsOptInEvent
 import io.element.android.libraries.designsystem.atomic.molecules.ButtonColumnMolecule
 import io.element.android.libraries.designsystem.atomic.molecules.IconTitleSubtitleMolecule
 import io.element.android.libraries.designsystem.atomic.pages.HeaderFooterPage
@@ -55,11 +55,11 @@ fun AnalyticsOptInView(
     val eventSink = state.eventSink
 
     fun onAcceptTerms() {
-        eventSink(AnalyticsOptInEvents.EnableAnalytics(true))
+        eventSink(AnalyticsOptInEvent.EnableAnalytics(true))
     }
 
     fun onDeclineTerms() {
-        eventSink(AnalyticsOptInEvents.EnableAnalytics(false))
+        eventSink(AnalyticsOptInEvent.EnableAnalytics(false))
     }
 
     BackHandler(onBack = ::onDeclineTerms)
@@ -171,7 +171,7 @@ private fun AnalyticsOptInFooter(
 
 @PreviewsDayNight
 @Composable
-internal fun AnalyticsOptInViewPreview(@PreviewParameter(AnalyticsOptInStateProvider::class) state: AnalyticsOptInState) = ElementPreview {
+internal fun AnalyticsOptInViewPreview(@PreviewParameter(AnalyticsOptInStatePreviewParam::class) state: AnalyticsOptInState) = ElementPreview {
     AnalyticsOptInView(
         state = state,
         onClickTerms = {},

features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/di/AnalyticsBindingContainer.kt

@@ -18,7 +18,7 @@ import io.element.android.libraries.architecture.Presenter
 
 @ContributesTo(AppScope::class)
 @BindingContainer
-interface AnalyticsModule {
+interface AnalyticsBindingContainer {
     @Binds
     fun bindAnalyticsPreferencesPresenter(presenter: AnalyticsPreferencesPresenter): Presenter<AnalyticsPreferencesState>
 }

features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/preferences/AnalyticsPreferencesPresenter.kt

@@ -13,7 +13,7 @@ import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.rememberCoroutineScope
 import dev.zacsweers.metro.Inject
 import io.element.android.appconfig.AnalyticsConfig
-import io.element.android.features.analytics.api.AnalyticsOptInEvents
+import io.element.android.features.analytics.api.AnalyticsOptInEvent
 import io.element.android.features.analytics.api.preferences.AnalyticsPreferencesState
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.core.meta.BuildMeta
@@ -31,9 +31,9 @@ class AnalyticsPreferencesPresenter(
         val localCoroutineScope = rememberCoroutineScope()
         val isEnabled = analyticsService.userConsentFlow.collectAsState(initial = false)
 
-        fun handleEvent(event: AnalyticsOptInEvents) {
+        fun handleEvent(event: AnalyticsOptInEvent) {
             when (event) {
-                is AnalyticsOptInEvents.EnableAnalytics -> localCoroutineScope.setIsEnabled(event.isEnabled)
+                is AnalyticsOptInEvent.EnableAnalytics -> localCoroutineScope.setIsEnabled(event.isEnabled)
             }
         }
 

features/analytics/impl/src/test/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInPresenterTest.kt

@@ -12,7 +12,7 @@ import app.cash.molecule.RecompositionMode
 import app.cash.molecule.moleculeFlow
 import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
-import io.element.android.features.analytics.api.AnalyticsOptInEvents
+import io.element.android.features.analytics.api.AnalyticsOptInEvent
 import io.element.android.libraries.matrix.test.core.aBuildMeta
 import io.element.android.services.analytics.test.FakeAnalyticsService
 import io.element.android.tests.testutils.WarmUpRule
@@ -37,7 +37,7 @@ class AnalyticsOptInPresenterTest {
         }.test {
             val initialState = awaitItem()
             assertThat(analyticsService.didAskUserConsentFlow.first()).isFalse()
-            initialState.eventSink.invoke(AnalyticsOptInEvents.EnableAnalytics(true))
+            initialState.eventSink.invoke(AnalyticsOptInEvent.EnableAnalytics(true))
             assertThat(analyticsService.didAskUserConsentFlow.first()).isTrue()
             assertThat(analyticsService.userConsentFlow.first()).isTrue()
         }
@@ -55,7 +55,7 @@ class AnalyticsOptInPresenterTest {
         }.test {
             val initialState = awaitItem()
             assertThat(analyticsService.didAskUserConsentFlow.first()).isFalse()
-            initialState.eventSink.invoke(AnalyticsOptInEvents.EnableAnalytics(false))
+            initialState.eventSink.invoke(AnalyticsOptInEvent.EnableAnalytics(false))
             assertThat(analyticsService.didAskUserConsentFlow.first()).isTrue()
             assertThat(analyticsService.userConsentFlow.first()).isFalse()
         }

features/analytics/impl/src/test/kotlin/io/element/android/features/analytics/impl/preferences/AnalyticsPreferencesPresenterTest.kt

@@ -13,7 +13,7 @@ import app.cash.molecule.moleculeFlow
 import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
 import io.element.android.appconfig.AnalyticsConfig
-import io.element.android.features.analytics.api.AnalyticsOptInEvents
+import io.element.android.features.analytics.api.AnalyticsOptInEvent
 import io.element.android.libraries.matrix.test.core.aBuildMeta
 import io.element.android.services.analytics.test.FakeAnalyticsService
 import io.element.android.tests.testutils.WarmUpRule
@@ -67,9 +67,9 @@ class AnalyticsPreferencesPresenterTest {
             skipItems(1)
             val initialState = awaitItem()
             assertThat(initialState.isEnabled).isTrue()
-            initialState.eventSink.invoke(AnalyticsOptInEvents.EnableAnalytics(false))
+            initialState.eventSink.invoke(AnalyticsOptInEvent.EnableAnalytics(false))
             assertThat(awaitItem().isEnabled).isFalse()
-            initialState.eventSink.invoke(AnalyticsOptInEvents.EnableAnalytics(true))
+            initialState.eventSink.invoke(AnalyticsOptInEvent.EnableAnalytics(true))
             assertThat(awaitItem().isEnabled).isTrue()
         }
     }

features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/AnnouncementStatePreviewParam.kt

@@ -11,7 +11,7 @@ package io.element.android.features.announcement.impl
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.features.announcement.api.Announcement
 
-open class AnnouncementStateProvider : PreviewParameterProvider<AnnouncementState> {
+open class AnnouncementStatePreviewParam : PreviewParameterProvider<AnnouncementState> {
     override val values: Sequence<AnnouncementState>
         get() = sequenceOf(
             anAnnouncementState(),

features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/fullscreen/FullscreenAnnouncementView.kt

@@ -33,7 +33,7 @@ import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.features.announcement.api.Announcement
 import io.element.android.features.announcement.impl.AnnouncementEvent
 import io.element.android.features.announcement.impl.AnnouncementState
-import io.element.android.features.announcement.impl.AnnouncementStateProvider
+import io.element.android.features.announcement.impl.AnnouncementStatePreviewParam
 import io.element.android.libraries.designsystem.atomic.molecules.ButtonColumnMolecule
 import io.element.android.libraries.designsystem.atomic.molecules.IconTitleSubtitleMolecule
 import io.element.android.libraries.designsystem.atomic.pages.HeaderFooterPage
@@ -216,7 +216,7 @@ private fun Announcement.Fullscreen.notice(): String? = when (this) {
 
 @PreviewsDayNight
 @Composable
-internal fun FullscreenAnnouncementViewPreview(@PreviewParameter(AnnouncementStateProvider::class) state: AnnouncementState) = ElementPreview {
+internal fun FullscreenAnnouncementViewPreview(@PreviewParameter(AnnouncementStatePreviewParam::class) state: AnnouncementState) = ElementPreview {
     FullscreenAnnouncementView(
         state = state,
     )

features/call/impl/src/main/kotlin/io/element/android/features/call/impl/pip/PictureInPictureEvent.kt

@@ -11,7 +11,9 @@ package io.element.android.features.call.impl.pip
 import io.element.android.features.call.impl.utils.PipController
 
 sealed interface PictureInPictureEvent {
+    data object OnCallStarted : PictureInPictureEvent
     data class SetPipController(val pipController: PipController) : PictureInPictureEvent
     data object EnterPictureInPicture : PictureInPictureEvent
     data class OnPictureInPictureModeChanged(val isInPip: Boolean) : PictureInPictureEvent
+    data class SetPipOrientation(val orientation: Int?) : PictureInPictureEvent
 }

features/call/impl/src/main/kotlin/io/element/android/features/call/impl/pip/PictureInPicturePresenter.kt

@@ -38,6 +38,9 @@ class PictureInPicturePresenter(
 
         fun handleEvent(event: PictureInPictureEvent) {
             when (event) {
+                is PictureInPictureEvent.OnCallStarted -> {
+                    pipController?.setupPipCallbacks()
+                }
                 is PictureInPictureEvent.SetPipController -> {
                     pipController = event.pipController
                 }
@@ -55,6 +58,12 @@ class PictureInPicturePresenter(
                         pipController?.exitPip()
                     }
                 }
+                is PictureInPictureEvent.SetPipOrientation -> {
+                    Timber.tag(loggerTag.value).d("onOrientationChange: ${event.orientation}")
+                    if (isPipSupported) {
+                        pipView?.setPipOrientation(event.orientation)
+                    }
+                }
             }
         }
 

features/call/impl/src/main/kotlin/io/element/android/features/call/impl/pip/PipView.kt

@@ -8,8 +8,15 @@
 
 package io.element.android.features.call.impl.pip
 
+import android.os.Build
+import androidx.annotation.RequiresApi
+
 interface PipView {
+    @RequiresApi(Build.VERSION_CODES.O)
+    fun setPipOrientation(orientation: Int?)
+    @RequiresApi(Build.VERSION_CODES.O)
     fun setPipParams()
+    @RequiresApi(Build.VERSION_CODES.O)
     fun enterPipMode(): Boolean
     fun hangUp()
 }

features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallNotificationDataPreviewParam.kt

@@ -16,7 +16,7 @@ import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.api.core.UserId
 
-open class CallNotificationDataProvider : PreviewParameterProvider<CallNotificationData> {
+open class CallNotificationDataPreviewParam : PreviewParameterProvider<CallNotificationData> {
     override val values: Sequence<CallNotificationData>
         get() = sequenceOf(
             aCallNotificationData(

features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenStatePreviewParam.kt

@@ -11,7 +11,7 @@ package io.element.android.features.call.impl.ui
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.libraries.architecture.AsyncData
 
-open class CallScreenStateProvider : PreviewParameterProvider<CallScreenState> {
+open class CallScreenStatePreviewParam : PreviewParameterProvider<CallScreenState> {
     override val values: Sequence<CallScreenState>
         get() = sequenceOf(
             aCallScreenState(),

features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenView.kt

@@ -118,6 +118,7 @@ internal fun CallScreenView(
                         if (webViewAudioManager?.isInCallMode?.get() == false) {
                             Timber.d("URL $url is loaded, starting in-call audio mode")
                             webViewAudioManager?.onCallStarted()
+                            pipState.eventSink(PictureInPictureEvent.OnCallStarted)
                         } else {
                             Timber.d("Can't start in-call audio mode since the app is already in it.")
                         }
@@ -130,7 +131,12 @@ internal fun CallScreenView(
                     onInvalidAudioDeviceAdded = { invalidAudioDeviceReason = it },
                 )
                 state.eventSink(CallScreenEvent.SetupMessageChannels(interceptor))
-                val pipController = WebViewPipController(webView)
+                val pipController = WebViewPipController(
+                    webView = webView,
+                    updatePipOrientation = { orientation ->
+                        pipState.eventSink(PictureInPictureEvent.SetPipOrientation(orientation))
+                    }
+                )
                 pipState.eventSink(PictureInPictureEvent.SetPipController(pipController))
             },
             onDestroyWebView = {
@@ -260,7 +266,7 @@ private fun WebView.dispatchEscKeyEvent() {
 @PreviewsDayNight
 @Composable
 internal fun CallScreenViewPreview(
-    @PreviewParameter(CallScreenStateProvider::class) state: CallScreenState,
+    @PreviewParameter(CallScreenStatePreviewParam::class) state: CallScreenState,
 ) = ElementPreview {
     CallScreenView(
         state = state,

features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/ElementCallActivity.kt

@@ -11,9 +11,9 @@ package io.element.android.features.call.impl.ui
 import android.Manifest
 import android.app.PictureInPictureParams
 import android.content.Intent
+import android.content.res.Configuration
 import android.os.Build
 import android.os.Bundle
-import android.util.Rational
 import android.view.WindowManager
 import android.webkit.PermissionRequest
 import androidx.activity.compose.setContent
@@ -49,6 +49,7 @@ import io.element.android.features.call.impl.pip.PipView
 import io.element.android.features.call.impl.services.CallForegroundService
 import io.element.android.features.enterprise.api.EnterpriseService
 import io.element.android.libraries.androidutils.browser.ConsoleMessageLogger
+import io.element.android.libraries.androidutils.media.setAspectRatioFromOrientation
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.architecture.bindings
 import io.element.android.libraries.audio.api.AudioFocus
@@ -86,6 +87,8 @@ class ElementCallActivity :
 
     private var eventSink: ((CallScreenEvent) -> Unit)? = null
 
+    private var currentPipOrientation: Int? = null
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -199,6 +202,9 @@ class ElementCallActivity :
         }
         DisposableEffect(Unit) {
             val onPictureInPictureModeChangedListener = Consumer { _: PictureInPictureModeChangedInfo ->
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    setPipParams()
+                }
                 pipEventSink(PictureInPictureEvent.OnPictureInPictureModeChanged(isInPictureInPictureMode))
                 if (!isInPictureInPictureMode && !lifecycle.currentState.isAtLeast(Lifecycle.State.STARTED)) {
                     Timber.tag(loggerTag.value).d("Exiting PiP mode: Hangup the call")
@@ -296,11 +302,18 @@ class ElementCallActivity :
         }
     }
 
+    @RequiresApi(Build.VERSION_CODES.O)
+    override fun setPipOrientation(orientation: Int?) {
+        currentPipOrientation = orientation
+        setPictureInPictureParams(getPictureInPictureParams())
+    }
+
     @RequiresApi(Build.VERSION_CODES.O)
     private fun getPictureInPictureParams(): PictureInPictureParams {
+        // Portrait for calls seems more appropriate as a fallback value
+        val orientation = currentPipOrientation ?: Configuration.ORIENTATION_PORTRAIT
         return PictureInPictureParams.Builder()
-            // Portrait for calls seems more appropriate
-            .setAspectRatio(Rational(3, 5))
+            .setAspectRatioFromOrientation(orientation)
             .apply {
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
                     setAutoEnterEnabled(true)

features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/IncomingCallScreen.kt

@@ -161,7 +161,7 @@ private fun ActionButton(
 @PreviewsDayNight
 @Composable
 internal fun IncomingCallScreenPreview(
-    @PreviewParameter(CallNotificationDataProvider::class) state: CallNotificationData,
+    @PreviewParameter(CallNotificationDataPreviewParam::class) state: CallNotificationData,
 ) = ElementPreview {
     IncomingCallScreen(
         notificationData = state,

features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/PipController.kt

@@ -9,6 +9,7 @@
 package io.element.android.features.call.impl.utils
 
 interface PipController {
+    fun setupPipCallbacks()
     suspend fun canEnterPip(): Boolean
     fun enterPip()
     fun exitPip()

features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/WebViewAudioManager.kt

@@ -250,7 +250,7 @@ class WebViewAudioManager(
 
                     hasRegisteredCallbacks = true
                 }
-            }
+            },
         )
         Timber.d("Setting androidNativeBridge javascript interface in webview")
         webView.addJavascriptInterface(webViewAudioDeviceSelectedCallback, "androidNativeBridge")

features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/WebViewPipController.kt

@@ -8,7 +8,10 @@
 
 package io.element.android.features.call.impl.utils
 
+import android.content.res.Configuration
+import android.webkit.JavascriptInterface
 import android.webkit.WebView
+import timber.log.Timber
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
 
@@ -18,7 +21,18 @@ import kotlin.coroutines.suspendCoroutine
  */
 class WebViewPipController(
     private val webView: WebView,
+    updatePipOrientation: (orientation: Int?) -> Unit,
 ) : PipController {
+    init {
+        // Register the JavaScript interface ahead of time to ensure it's available when the WebView content is loaded and tries to call it
+        webView.addJavascriptInterface(PipBridge(updatePipOrientation), "androidPipBridge")
+    }
+
+    override fun setupPipCallbacks() {
+        Timber.d("Adding callback in controls.onPipMediaOrientationUpdate")
+        webView.evaluateJavascript("controls.onPipMediaOrientationUpdate = (orientation) => { androidPipBridge.setPipOrientation(orientation); };", null)
+    }
+
     override suspend fun canEnterPip(): Boolean {
         return suspendCoroutine { continuation ->
             webView.evaluateJavascript("controls.canEnterPip()") { result ->
@@ -36,3 +50,19 @@ class WebViewPipController(
         webView.evaluateJavascript("controls.disablePip()", null)
     }
 }
+
+private class PipBridge(
+    private val onOrientationChange: (orientation: Int?) -> Unit,
+) {
+    @JavascriptInterface
+    fun setPipOrientation(orientation: String?) {
+        Timber.d("Picture-in-picture orientation changed in webview, orientation: $orientation")
+        // This callback is used to update the picture-in-picture orientation in the WebView when it changes
+        val orientation = when (orientation) {
+            "portrait" -> Configuration.ORIENTATION_PORTRAIT
+            "landscape" -> Configuration.ORIENTATION_LANDSCAPE
+            else -> return
+        }
+        onOrientationChange(orientation)
+    }
+}

features/call/impl/src/test/kotlin/io/element/android/features/call/impl/pip/FakePipController.kt

@@ -12,10 +12,13 @@ import io.element.android.features.call.impl.utils.PipController
 import io.element.android.tests.testutils.lambda.lambdaError
 
 class FakePipController(
+    private val setupPipCallbacksResult: () -> Unit = { lambdaError() },
     private val canEnterPipResult: () -> Boolean = { lambdaError() },
     private val enterPipResult: () -> Unit = { lambdaError() },
     private val exitPipResult: () -> Unit = { lambdaError() },
 ) : PipController {
+    override fun setupPipCallbacks() = setupPipCallbacksResult()
+
     override suspend fun canEnterPip(): Boolean = canEnterPipResult()
 
     override fun enterPip() = enterPipResult()

features/call/impl/src/test/kotlin/io/element/android/features/call/impl/pip/FakePipView.kt

@@ -13,9 +13,11 @@ import io.element.android.tests.testutils.lambda.lambdaError
 class FakePipView(
     private val setPipParamsResult: () -> Unit = { lambdaError() },
     private val enterPipModeResult: () -> Boolean = { lambdaError() },
-    private val handUpResult: () -> Unit = { lambdaError() }
+    private val handUpResult: () -> Unit = { lambdaError() },
+    private val onOrientationChangeResult: (orientation: Int?) -> Unit = { lambdaError() },
 ) : PipView {
     override fun setPipParams() = setPipParamsResult()
     override fun enterPipMode(): Boolean = enterPipModeResult()
     override fun hangUp() = handUpResult()
+    override fun setPipOrientation(orientation: Int?) = onOrientationChangeResult(orientation)
 }

features/contentscanner/impl/src/main/kotlin/io/element/android/features/contentscanner/impl/di/ContentScannerBindingContainer.kt

@@ -21,7 +21,7 @@ import kotlinx.coroutines.CoroutineScope
 
 @BindingContainer
 @ContributesTo(RoomScope::class)
-object ContentScannerModule {
+object ContentScannerBindingContainer {
     @Provides
     @SingleIn(RoomScope::class)
     fun providesContentScannerService(

features/contentscanner/impl/src/test/kotlin/io/element/android/features/contentscanner/impl/di/ContentScannerBindingContainerTest.kt

@@ -15,16 +15,16 @@ import io.element.android.tests.testutils.testCoroutineDispatchers
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 
-class ContentScannerModuleTest {
+class ContentScannerBindingContainerTest {
     @Test
-    fun `ContentScannerModule provides NoopContentScannerService when ContentScanner is null`() = runTest {
+    fun `ContentScannerBindingContainer provides NoopContentScannerService when ContentScanner is null`() = runTest {
         // Given
         val contentScanner: ContentScanner? = null
         val sessionCoroutineScope = backgroundScope
         val coroutineDispatchers = testCoroutineDispatchers()
 
         // When
-        val contentScannerService = ContentScannerModule.providesContentScannerService(
+        val contentScannerService = ContentScannerBindingContainer.providesContentScannerService(
             contentScanner = contentScanner,
             coroutineScope = sessionCoroutineScope,
             coroutineDispatchers = coroutineDispatchers,
@@ -35,14 +35,14 @@ class ContentScannerModuleTest {
     }
 
     @Test
-    fun `ContentScannerModule provides DefaultContentScannerService when ContentScanner is not null`() = runTest {
+    fun `ContentScannerBindingContainer provides DefaultContentScannerService when ContentScanner is not null`() = runTest {
         // Given
         val contentScanner: ContentScanner? = FakeContentScanner()
         val sessionCoroutineScope = backgroundScope
         val coroutineDispatchers = testCoroutineDispatchers()
 
         // When
-        val contentScannerService = ContentScannerModule.providesContentScannerService(
+        val contentScannerService = ContentScannerBindingContainer.providesContentScannerService(
             contentScanner = contentScanner,
             coroutineScope = sessionCoroutineScope,
             coroutineDispatchers = coroutineDispatchers,

features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleView.kt

@@ -21,9 +21,9 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import io.element.android.features.createroom.impl.R
-import io.element.android.features.invitepeople.api.InvitePeopleEvents
+import io.element.android.features.invitepeople.api.InvitePeopleEvent
 import io.element.android.features.invitepeople.api.InvitePeopleState
-import io.element.android.features.invitepeople.api.InvitePeopleStateProvider
+import io.element.android.features.invitepeople.api.InvitePeopleStatePreviewParam
 import io.element.android.libraries.designsystem.atomic.pages.HeaderFooterPage
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
@@ -56,7 +56,7 @@ fun AddPeopleView(
             Button(
                 text = stringResource(CommonStrings.action_finish),
                 onClick = {
-                    state.eventSink(InvitePeopleEvents.SendInvites)
+                    state.eventSink(InvitePeopleEvent.SendInvites)
                 },
                 enabled = state.canInvite,
                 modifier = Modifier
@@ -86,7 +86,7 @@ private fun AddPeopleTopBar(
 
 @PreviewsDayNight
 @Composable
-internal fun AddPeopleViewPreview(@PreviewParameter(InvitePeopleStateProvider::class) state: InvitePeopleState) = ElementPreview {
+internal fun AddPeopleViewPreview(@PreviewParameter(InvitePeopleStatePreviewParam::class) state: InvitePeopleState) = ElementPreview {
     AddPeopleView(
         state = state,
         invitePeopleView = {},

features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomEvent.kt

@@ -11,13 +11,13 @@ package io.element.android.features.createroom.impl.configureroom
 import io.element.android.libraries.matrix.api.spaces.SpaceRoom
 import io.element.android.libraries.matrix.ui.media.AvatarAction
 
-sealed interface ConfigureRoomEvents {
-    data class RoomNameChanged(val name: String) : ConfigureRoomEvents
-    data class TopicChanged(val topic: String) : ConfigureRoomEvents
-    data class JoinRuleChanged(val joinRuleItem: JoinRuleItem) : ConfigureRoomEvents
-    data class RoomAddressChanged(val roomAddress: String) : ConfigureRoomEvents
-    data object CreateRoom : ConfigureRoomEvents
-    data class HandleAvatarAction(val action: AvatarAction) : ConfigureRoomEvents
-    data class SetParentSpace(val space: SpaceRoom?) : ConfigureRoomEvents
-    data object CancelCreateRoom : ConfigureRoomEvents
+sealed interface ConfigureRoomEvent {
+    data class RoomNameChanged(val name: String) : ConfigureRoomEvent
+    data class TopicChanged(val topic: String) : ConfigureRoomEvent
+    data class JoinRuleChanged(val joinRuleItem: JoinRuleItem) : ConfigureRoomEvent
+    data class RoomAddressChanged(val roomAddress: String) : ConfigureRoomEvent
+    data object CreateRoom : ConfigureRoomEvent
+    data class HandleAvatarAction(val action: AvatarAction) : ConfigureRoomEvent
+    data class SetParentSpace(val space: SpaceRoom?) : ConfigureRoomEvent
+    data object CancelCreateRoom : ConfigureRoomEvent
 }

features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomPresenter.kt

@@ -188,14 +188,14 @@ class ConfigureRoomPresenter(
             localCoroutineScope.createRoom(config, createRoomAction)
         }
 
-        fun handleEvent(event: ConfigureRoomEvents) {
+        fun handleEvent(event: ConfigureRoomEvent) {
             when (event) {
-                is ConfigureRoomEvents.RoomNameChanged -> dataStore.setRoomName(event.name)
-                is ConfigureRoomEvents.TopicChanged -> dataStore.setTopic(event.topic)
-                is ConfigureRoomEvents.JoinRuleChanged -> dataStore.setJoinRule(event.joinRuleItem)
-                is ConfigureRoomEvents.RoomAddressChanged -> dataStore.setRoomAddress(event.roomAddress)
-                is ConfigureRoomEvents.CreateRoom -> createRoom(createRoomConfig)
-                is ConfigureRoomEvents.HandleAvatarAction -> {
+                is ConfigureRoomEvent.RoomNameChanged -> dataStore.setRoomName(event.name)
+                is ConfigureRoomEvent.TopicChanged -> dataStore.setTopic(event.topic)
+                is ConfigureRoomEvent.JoinRuleChanged -> dataStore.setJoinRule(event.joinRuleItem)
+                is ConfigureRoomEvent.RoomAddressChanged -> dataStore.setRoomAddress(event.roomAddress)
+                is ConfigureRoomEvent.CreateRoom -> createRoom(createRoomConfig)
+                is ConfigureRoomEvent.HandleAvatarAction -> {
                     when (event.action) {
                         AvatarAction.ChoosePhoto -> galleryImagePicker.launch()
                         AvatarAction.TakePhoto -> if (cameraPermissionState.permissionGranted) {
@@ -207,10 +207,10 @@ class ConfigureRoomPresenter(
                         AvatarAction.Remove -> dataStore.setAvatarUri(uri = null)
                     }
                 }
-                is ConfigureRoomEvents.SetParentSpace -> {
+                is ConfigureRoomEvent.SetParentSpace -> {
                     dataStore.setParentSpace(event.space, false)
                 }
-                ConfigureRoomEvents.CancelCreateRoom -> {
+                ConfigureRoomEvent.CancelCreateRoom -> {
                     createRoomAction.value = AsyncAction.Uninitialized
                 }
             }

features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomState.kt

@@ -26,7 +26,7 @@ data class ConfigureRoomState(
     val homeserverName: String,
     val availableJoinRules: ImmutableList<JoinRuleItem>,
     val spaces: ImmutableList<SpaceRoom>,
-    val eventSink: (ConfigureRoomEvents) -> Unit
+    val eventSink: (ConfigureRoomEvent) -> Unit
 ) {
     val isValid: Boolean = config.roomName?.isNotEmpty() == true &&
         (config.visibilityState is RoomVisibilityState.Private || roomAddressValidity == RoomAddressValidity.Valid) &&

features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomStatePreviewParam.kt

@@ -21,7 +21,7 @@ import io.element.android.libraries.permissions.api.aPermissionsState
 import io.element.android.libraries.previewutils.room.aSpaceRoom
 import kotlinx.collections.immutable.toImmutableList
 
-open class ConfigureRoomStateProvider : PreviewParameterProvider<ConfigureRoomState> {
+open class ConfigureRoomStatePreviewParam : PreviewParameterProvider<ConfigureRoomState> {
     override val values: Sequence<ConfigureRoomState>
         get() = sequenceOf(
             aConfigureRoomState(),
@@ -143,7 +143,7 @@ fun aConfigureRoomState(
         )
     },
     spaces: List<SpaceRoom> = emptyList(),
-    eventSink: (ConfigureRoomEvents) -> Unit = { },
+    eventSink: (ConfigureRoomEvent) -> Unit = { },
 ) = ConfigureRoomState(
     config = config,
     isSpace = isSpace,

features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomView.kt

@@ -96,7 +96,7 @@ fun ConfigureRoomView(
                 onBackClick = onBackClick,
                 onNextClick = {
                     focusManager.clearFocus()
-                    state.eventSink(ConfigureRoomEvents.CreateRoom)
+                    state.eventSink(ConfigureRoomEvent.CreateRoom)
                 },
             )
         }
@@ -114,20 +114,20 @@ fun ConfigureRoomView(
                 avatarUri = state.config.avatarUri,
                 roomName = state.config.roomName.orEmpty(),
                 onAvatarClick = ::onAvatarClick,
-                onChangeRoomName = { state.eventSink(ConfigureRoomEvents.RoomNameChanged(it)) },
+                onChangeRoomName = { state.eventSink(ConfigureRoomEvent.RoomNameChanged(it)) },
             )
             Spacer(modifier = Modifier.height(16.dp))
             RoomTopic(
                 modifier = Modifier.padding(horizontal = 16.dp),
                 topic = state.config.topic.orEmpty(),
-                onTopicChange = { state.eventSink(ConfigureRoomEvents.TopicChanged(it)) },
+                onTopicChange = { state.eventSink(ConfigureRoomEvent.TopicChanged(it)) },
             )
             Spacer(modifier = Modifier.height(16.dp))
             if (!state.isSpace && state.spaces.isNotEmpty()) {
                 SelectParentSpaceOptions(
                     spaces = state.spaces,
                     selectedSpace = state.config.parentSpace,
-                    onSelectSpace = { state.eventSink(ConfigureRoomEvents.SetParentSpace(it)) },
+                    onSelectSpace = { state.eventSink(ConfigureRoomEvent.SetParentSpace(it)) },
                 )
             }
             RoomJoinRuleOptions(
@@ -136,7 +136,7 @@ fun ConfigureRoomView(
                 parentSpace = state.config.parentSpace,
                 onOptionClick = {
                     focusManager.clearFocus()
-                    state.eventSink(ConfigureRoomEvents.JoinRuleChanged(it))
+                    state.eventSink(ConfigureRoomEvent.JoinRuleChanged(it))
                 },
             )
             if (state.config.visibilityState !is RoomVisibilityState.Private) {
@@ -146,7 +146,7 @@ fun ConfigureRoomView(
                     address = state.config.visibilityState.roomAddress().getOrNull().orEmpty(),
                     homeserverName = state.homeserverName,
                     addressValidity = state.roomAddressValidity,
-                    onAddressChange = { state.eventSink(ConfigureRoomEvents.RoomAddressChanged(it)) },
+                    onAddressChange = { state.eventSink(ConfigureRoomEvent.RoomAddressChanged(it)) },
                     label = null,
                     supportingText = stringResource(R.string.screen_create_room_room_address_section_footer),
                 )
@@ -158,7 +158,7 @@ fun ConfigureRoomView(
         actions = state.avatarActions,
         isVisible = isAvatarActionsSheetVisible.value,
         onDismiss = { isAvatarActionsSheetVisible.value = false },
-        onSelectAction = { state.eventSink(ConfigureRoomEvents.HandleAvatarAction(it)) }
+        onSelectAction = { state.eventSink(ConfigureRoomEvent.HandleAvatarAction(it)) }
     )
 
     AsyncActionView(
@@ -170,8 +170,8 @@ fun ConfigureRoomView(
         },
         onSuccess = { onCreateRoomSuccess(it) },
         errorMessage = { stringResource(if (isSpace) R.string.screen_create_room_error_creating_space else R.string.screen_create_room_error_creating_room) },
-        onRetry = { state.eventSink(ConfigureRoomEvents.CreateRoom) },
-        onErrorDismiss = { state.eventSink(ConfigureRoomEvents.CancelCreateRoom) },
+        onRetry = { state.eventSink(ConfigureRoomEvent.CreateRoom) },
+        onErrorDismiss = { state.eventSink(ConfigureRoomEvent.CancelCreateRoom) },
     )
 
     PermissionsView(
@@ -349,12 +349,12 @@ private fun RoomJoinRuleOptions(
 
 @PreviewWithLargeHeight
 @Composable
-internal fun ConfigureRoomViewLightPreview(@PreviewParameter(ConfigureRoomStateProvider::class) state: ConfigureRoomState) =
+internal fun ConfigureRoomViewLightPreview(@PreviewParameter(ConfigureRoomStatePreviewParam::class) state: ConfigureRoomState) =
     ElementPreviewLight { ContentToPreview(state) }
 
 @PreviewWithLargeHeight
 @Composable
-internal fun ConfigureRoomViewDarkPreview(@PreviewParameter(ConfigureRoomStateProvider::class) state: ConfigureRoomState) =
+internal fun ConfigureRoomViewDarkPreview(@PreviewParameter(ConfigureRoomStatePreviewParam::class) state: ConfigureRoomState) =
     ElementPreviewDark { ContentToPreview(state) }
 
 @ExcludeFromCoverage

features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/ConfigureRoomPresenterTest.kt

@@ -12,7 +12,7 @@ import androidx.core.net.toUri
 import app.cash.turbine.TurbineTestContext
 import com.google.common.truth.Truth.assertThat
 import im.vector.app.features.analytics.plan.CreatedRoom
-import io.element.android.features.createroom.impl.configureroom.ConfigureRoomEvents
+import io.element.android.features.createroom.impl.configureroom.ConfigureRoomEvent
 import io.element.android.features.createroom.impl.configureroom.ConfigureRoomPresenter
 import io.element.android.features.createroom.impl.configureroom.ConfigureRoomState
 import io.element.android.features.createroom.impl.configureroom.CreateRoomConfig
@@ -106,14 +106,14 @@ class ConfigureRoomPresenterTest : RobolectricTest() {
             assertThat(initialState.isValid).isFalse()
 
             // Room name not empty
-            initialState.eventSink(ConfigureRoomEvents.RoomNameChanged(A_ROOM_NAME))
+            initialState.eventSink(ConfigureRoomEvent.RoomNameChanged(A_ROOM_NAME))
             var newState: ConfigureRoomState = awaitItem()
             config = config.copy(roomName = A_ROOM_NAME)
             assertThat(newState.config).isEqualTo(config)
             assertThat(newState.isValid).isTrue()
 
             // Clear room name
-            newState.eventSink(ConfigureRoomEvents.RoomNameChanged(""))
+            newState.eventSink(ConfigureRoomEvent.RoomNameChanged(""))
             newState = awaitItem()
             config = config.copy(roomName = null)
             assertThat(newState.config).isEqualTo(config)
@@ -136,13 +136,13 @@ class ConfigureRoomPresenterTest : RobolectricTest() {
             var expectedConfig = CreateRoomConfig()
             assertThat(initialState.config).isEqualTo(expectedConfig)
             // Room name
-            initialState.eventSink(ConfigureRoomEvents.RoomNameChanged(A_ROOM_NAME))
+            initialState.eventSink(ConfigureRoomEvent.RoomNameChanged(A_ROOM_NAME))
             var newState = awaitItem()
             expectedConfig = expectedConfig.copy(roomName = A_ROOM_NAME)
             assertThat(newState.config).isEqualTo(expectedConfig)
 
             // Room topic
-            newState.eventSink(ConfigureRoomEvents.TopicChanged(A_MESSAGE))
+            newState.eventSink(ConfigureRoomEvent.TopicChanged(A_MESSAGE))
             newState = awaitItem()
             expectedConfig = expectedConfig.copy(topic = A_MESSAGE)
             assertThat(newState.config).isEqualTo(expectedConfig)
@@ -153,7 +153,7 @@ class ConfigureRoomPresenterTest : RobolectricTest() {
             // From gallery
             val uriFromGallery = AN_URI_FROM_GALLERY
             pickerProvider.givenResult(uriFromGallery.toUri())
-            newState.eventSink(ConfigureRoomEvents.HandleAvatarAction(AvatarAction.ChoosePhoto))
+            newState.eventSink(ConfigureRoomEvent.HandleAvatarAction(AvatarAction.ChoosePhoto))
             newState = awaitItem()
             expectedConfig = expectedConfig.copy(avatarUri = uriFromGallery)
             assertThat(newState.config).isEqualTo(expectedConfig)
@@ -161,7 +161,7 @@ class ConfigureRoomPresenterTest : RobolectricTest() {
             val uriFromCamera = AN_URI_FROM_CAMERA
             pickerProvider.givenResult(uriFromCamera.toUri())
             assertThat(newState.cameraPermissionState.permissionGranted).isFalse()
-            newState.eventSink(ConfigureRoomEvents.HandleAvatarAction(AvatarAction.TakePhoto))
+            newState.eventSink(ConfigureRoomEvent.HandleAvatarAction(AvatarAction.TakePhoto))
             newState = awaitItem()
             assertThat(newState.cameraPermissionState.showDialog).isTrue()
             permissionsPresenter.setPermissionGranted()
@@ -173,18 +173,18 @@ class ConfigureRoomPresenterTest : RobolectricTest() {
             // Do it again, no permission is requested
             val uriFromCamera2 = AN_URI_FROM_CAMERA_2
             pickerProvider.givenResult(uriFromCamera2.toUri())
-            newState.eventSink(ConfigureRoomEvents.HandleAvatarAction(AvatarAction.TakePhoto))
+            newState.eventSink(ConfigureRoomEvent.HandleAvatarAction(AvatarAction.TakePhoto))
             newState = awaitItem()
             expectedConfig = expectedConfig.copy(avatarUri = uriFromCamera2)
             assertThat(newState.config).isEqualTo(expectedConfig)
             // Remove
-            newState.eventSink(ConfigureRoomEvents.HandleAvatarAction(AvatarAction.Remove))
+            newState.eventSink(ConfigureRoomEvent.HandleAvatarAction(AvatarAction.Remove))
             newState = awaitItem()
             expectedConfig = expectedConfig.copy(avatarUri = null)
             assertThat(newState.config).isEqualTo(expectedConfig)
 
             // Room privacy
-            newState.eventSink(ConfigureRoomEvents.JoinRuleChanged(JoinRuleItem.PublicVisibility.Public))
+            newState.eventSink(ConfigureRoomEvent.JoinRuleChanged(JoinRuleItem.PublicVisibility.Public))
             newState = awaitItem()
             expectedConfig = expectedConfig.copy(
                 visibilityState = RoomVisibilityState.Public(
@@ -208,7 +208,7 @@ class ConfigureRoomPresenterTest : RobolectricTest() {
 
             matrixClient.givenCreateRoomResult(createRoomResult)
 
-            initialState.eventSink(ConfigureRoomEvents.CreateRoom)
+            initialState.eventSink(ConfigureRoomEvent.CreateRoom)
             assertThat(awaitItem().createRoomAction).isInstanceOf(AsyncAction.Loading::class.java)
             val stateAfterCreateRoom = awaitItem()
             assertThat(stateAfterCreateRoom.createRoomAction).isInstanceOf(AsyncAction.Success::class.java)
@@ -239,13 +239,13 @@ class ConfigureRoomPresenterTest : RobolectricTest() {
 
             // Use a public parent space so AskToJoin is a valid option
             val parentSpace = aSpaceRoom(joinRule = JoinRule.Public)
-            initialState.eventSink(ConfigureRoomEvents.SetParentSpace(parentSpace))
+            initialState.eventSink(ConfigureRoomEvent.SetParentSpace(parentSpace))
             assertThat(awaitItem().config.parentSpace).isEqualTo(parentSpace)
 
-            initialState.eventSink(ConfigureRoomEvents.JoinRuleChanged(JoinRuleItem.PublicVisibility.AskToJoin))
+            initialState.eventSink(ConfigureRoomEvent.JoinRuleChanged(JoinRuleItem.PublicVisibility.AskToJoin))
             assertThat(awaitItem().config.visibilityState.joinRuleItem).isEqualTo(JoinRuleItem.PublicVisibility.AskToJoin)
 
-            initialState.eventSink(ConfigureRoomEvents.CreateRoom)
+            initialState.eventSink(ConfigureRoomEvent.CreateRoom)
             assertThat(awaitItem().createRoomAction).isInstanceOf(AsyncAction.Loading::class.java)
             val stateAfterCreateRoom = awaitItem()
 
@@ -282,13 +282,13 @@ class ConfigureRoomPresenterTest : RobolectricTest() {
 
             // Use a public parent space so AskToJoin is a valid option
             val parentSpace = aSpaceRoom(joinRule = JoinRule.Public)
-            initialState.eventSink(ConfigureRoomEvents.SetParentSpace(parentSpace))
+            initialState.eventSink(ConfigureRoomEvent.SetParentSpace(parentSpace))
             assertThat(awaitItem().config.parentSpace).isEqualTo(parentSpace)
 
-            initialState.eventSink(ConfigureRoomEvents.JoinRuleChanged(JoinRuleItem.PublicVisibility.AskToJoin))
+            initialState.eventSink(ConfigureRoomEvent.JoinRuleChanged(JoinRuleItem.PublicVisibility.AskToJoin))
             assertThat(awaitItem().config.visibilityState.joinRuleItem).isEqualTo(JoinRuleItem.PublicVisibility.AskToJoin)
 
-            initialState.eventSink(ConfigureRoomEvents.CreateRoom)
+            initialState.eventSink(ConfigureRoomEvent.CreateRoom)
 
             // We immediately receive the room power levels info needed for adding the child to a space
             val powerLevels = RoomPowerLevels(
@@ -339,7 +339,7 @@ class ConfigureRoomPresenterTest : RobolectricTest() {
 
             matrixClient.givenCreateRoomResult(createRoomResult)
 
-            initialState.eventSink(ConfigureRoomEvents.CreateRoom)
+            initialState.eventSink(ConfigureRoomEvent.CreateRoom)
             skipItems(2)
 
             val analyticsEvent = analyticsService.capturedEvents.filterIsInstance<CreatedRoom>().firstOrNull()
@@ -369,14 +369,14 @@ class ConfigureRoomPresenterTest : RobolectricTest() {
                 mediaPreProcessor.givenResult(Result.success(MediaUploadInfo.Image(file, mockk(), mockk())))
                 matrixClient.givenUploadMediaResult(Result.failure(AN_EXCEPTION))
 
-                initialState.eventSink(ConfigureRoomEvents.CreateRoom)
+                initialState.eventSink(ConfigureRoomEvent.CreateRoom)
                 assertThat(awaitItem().createRoomAction).isInstanceOf(AsyncAction.Loading::class.java)
                 val stateAfterCreateRoom = awaitItem()
                 assertThat(stateAfterCreateRoom.createRoomAction).isInstanceOf(AsyncAction.Failure::class.java)
                 assertThat(analyticsService.capturedEvents.filterIsInstance<CreatedRoom>()).isEmpty()
 
                 matrixClient.givenUploadMediaResult(Result.success(AN_AVATAR_URL))
-                stateAfterCreateRoom.eventSink(ConfigureRoomEvents.CreateRoom)
+                stateAfterCreateRoom.eventSink(ConfigureRoomEvent.CreateRoom)
                 assertThat(awaitItem().createRoomAction).isInstanceOf(AsyncAction.Uninitialized::class.java)
                 assertThat(awaitItem().createRoomAction).isInstanceOf(AsyncAction.Loading::class.java)
                 assertThat(awaitItem().createRoomAction).isInstanceOf(AsyncAction.Success::class.java)
@@ -399,14 +399,14 @@ class ConfigureRoomPresenterTest : RobolectricTest() {
             fakeMatrixClient.givenCreateRoomResult(createRoomResult)
 
             // Create
-            initialState.eventSink(ConfigureRoomEvents.CreateRoom)
+            initialState.eventSink(ConfigureRoomEvent.CreateRoom)
             assertThat(awaitItem().createRoomAction).isInstanceOf(AsyncAction.Loading::class.java)
             val stateAfterCreateRoom = awaitItem()
             assertThat(stateAfterCreateRoom.createRoomAction).isInstanceOf(AsyncAction.Failure::class.java)
             assertThat((stateAfterCreateRoom.createRoomAction as? AsyncAction.Failure)?.error).isEqualTo(createRoomResult.exceptionOrNull())
 
             // Retry
-            stateAfterCreateRoom.eventSink(ConfigureRoomEvents.CreateRoom)
+            stateAfterCreateRoom.eventSink(ConfigureRoomEvent.CreateRoom)
             assertThat(awaitItem().createRoomAction).isInstanceOf(AsyncAction.Uninitialized::class.java)
             assertThat(awaitItem().createRoomAction).isInstanceOf(AsyncAction.Loading::class.java)
             val stateAfterRetry = awaitItem()
@@ -414,7 +414,7 @@ class ConfigureRoomPresenterTest : RobolectricTest() {
             assertThat((stateAfterRetry.createRoomAction as? AsyncAction.Failure)?.error).isEqualTo(createRoomResult.exceptionOrNull())
 
             // Cancel
-            stateAfterRetry.eventSink(ConfigureRoomEvents.CancelCreateRoom)
+            stateAfterRetry.eventSink(ConfigureRoomEvent.CancelCreateRoom)
             assertThat(awaitItem().createRoomAction).isInstanceOf(AsyncAction.Uninitialized::class.java)
         }
     }
@@ -430,9 +430,9 @@ class ConfigureRoomPresenterTest : RobolectricTest() {
         )
         presenter.test {
             val initialState = initialState()
-            initialState.eventSink(ConfigureRoomEvents.JoinRuleChanged(JoinRuleItem.PublicVisibility.Public))
+            initialState.eventSink(ConfigureRoomEvent.JoinRuleChanged(JoinRuleItem.PublicVisibility.Public))
             skipItems(1)
-            initialState.eventSink(ConfigureRoomEvents.RoomAddressChanged("invalid address"))
+            initialState.eventSink(ConfigureRoomEvent.RoomAddressChanged("invalid address"))
             skipItems(1)
             advanceUntilIdle()
             awaitItem().also { state ->
@@ -450,9 +450,9 @@ class ConfigureRoomPresenterTest : RobolectricTest() {
         )
         presenter.test {
             val initialState = initialState()
-            initialState.eventSink(ConfigureRoomEvents.JoinRuleChanged(JoinRuleItem.PublicVisibility.Public))
+            initialState.eventSink(ConfigureRoomEvent.JoinRuleChanged(JoinRuleItem.PublicVisibility.Public))
             skipItems(1)
-            initialState.eventSink(ConfigureRoomEvents.RoomAddressChanged("address"))
+            initialState.eventSink(ConfigureRoomEvent.RoomAddressChanged("address"))
             skipItems(1)
             advanceUntilIdle()
             awaitItem().also { state ->
@@ -470,9 +470,9 @@ class ConfigureRoomPresenterTest : RobolectricTest() {
         )
         presenter.test {
             val initialState = initialState()
-            initialState.eventSink(ConfigureRoomEvents.JoinRuleChanged(JoinRuleItem.PublicVisibility.Public))
+            initialState.eventSink(ConfigureRoomEvent.JoinRuleChanged(JoinRuleItem.PublicVisibility.Public))
             skipItems(1)
-            initialState.eventSink(ConfigureRoomEvents.RoomAddressChanged("address"))
+            initialState.eventSink(ConfigureRoomEvent.RoomAddressChanged("address"))
             skipItems(1)
             advanceUntilIdle()
             awaitItem().also { state ->
@@ -488,22 +488,22 @@ class ConfigureRoomPresenterTest : RobolectricTest() {
             val initialState = initialState()
 
             // First change the join rule to public
-            initialState.eventSink(ConfigureRoomEvents.JoinRuleChanged(JoinRuleItem.PublicVisibility.Public))
+            initialState.eventSink(ConfigureRoomEvent.JoinRuleChanged(JoinRuleItem.PublicVisibility.Public))
             assertThat(awaitItem().config.visibilityState).isInstanceOf(RoomVisibilityState.Public::class.java)
 
             // Then check changing the parent space resets it to private
             // (via LaunchedEffect fallback since Public is not in availableJoinRules for non-public parent)
-            initialState.eventSink(ConfigureRoomEvents.SetParentSpace(aSpaceRoom()))
+            initialState.eventSink(ConfigureRoomEvent.SetParentSpace(aSpaceRoom()))
             skipItems(1) // Skip intermediate state
             assertThat(awaitItem().config.visibilityState).isEqualTo(RoomVisibilityState.Private(JoinRuleItem.PrivateVisibility.Private))
 
             // If we change the join rule back to public
-            initialState.eventSink(ConfigureRoomEvents.JoinRuleChanged(JoinRuleItem.PublicVisibility.Public))
+            initialState.eventSink(ConfigureRoomEvent.JoinRuleChanged(JoinRuleItem.PublicVisibility.Public))
             skipItems(1) // Skip intermediate state (Public is still invalid)
             assertThat(awaitItem().config.visibilityState).isEqualTo(RoomVisibilityState.Private(JoinRuleItem.PrivateVisibility.Private))
 
             // Then remove the parent space, the join rule stays private
-            initialState.eventSink(ConfigureRoomEvents.SetParentSpace(null))
+            initialState.eventSink(ConfigureRoomEvent.SetParentSpace(null))
             assertThat(awaitItem().config.visibilityState).isEqualTo(RoomVisibilityState.Private(JoinRuleItem.PrivateVisibility.Private))
         }
     }
@@ -514,7 +514,7 @@ class ConfigureRoomPresenterTest : RobolectricTest() {
         presenter.test {
             val initialState = initialState()
 
-            initialState.eventSink(ConfigureRoomEvents.SetParentSpace(aSpaceRoom()))
+            initialState.eventSink(ConfigureRoomEvent.SetParentSpace(aSpaceRoom()))
 
             assertThat(awaitError())
         }
@@ -534,8 +534,8 @@ class ConfigureRoomPresenterTest : RobolectricTest() {
         presenter.test {
             val initialState = initialState()
 
-            initialState.eventSink(ConfigureRoomEvents.JoinRuleChanged(JoinRuleItem.PrivateVisibility.Private))
-            initialState.eventSink(ConfigureRoomEvents.CreateRoom)
+            initialState.eventSink(ConfigureRoomEvent.JoinRuleChanged(JoinRuleItem.PrivateVisibility.Private))
+            initialState.eventSink(ConfigureRoomEvent.CreateRoom)
 
             assertThat(awaitItem().createRoomAction.isLoading()).isTrue()
             assertThat(awaitItem().createRoomAction.isSuccess()).isTrue()

features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/AccountDeactivationEvent.kt

@@ -8,9 +8,9 @@
 
 package io.element.android.features.logout.impl
 
-sealed interface AccountDeactivationEvents {
-    data class SetEraseData(val eraseData: Boolean) : AccountDeactivationEvents
-    data class SetPassword(val password: String) : AccountDeactivationEvents
-    data class DeactivateAccount(val isRetry: Boolean) : AccountDeactivationEvents
-    data object CloseDialogs : AccountDeactivationEvents
+sealed interface AccountDeactivationEvent {
+    data class SetEraseData(val eraseData: Boolean) : AccountDeactivationEvent
+    data class SetPassword(val password: String) : AccountDeactivationEvent
+    data class DeactivateAccount(val isRetry: Boolean) : AccountDeactivationEvent
+    data object CloseDialogs : AccountDeactivationEvent
 }

features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/AccountDeactivationPresenter.kt

@@ -34,19 +34,19 @@ class AccountDeactivationPresenter(
 
         val formState = remember { mutableStateOf(DeactivateFormState.Default) }
 
-        fun handleEvent(event: AccountDeactivationEvents) {
+        fun handleEvent(event: AccountDeactivationEvent) {
             when (event) {
-                is AccountDeactivationEvents.SetEraseData -> {
+                is AccountDeactivationEvent.SetEraseData -> {
                     updateFormState(formState) {
                         copy(eraseData = event.eraseData)
                     }
                 }
-                is AccountDeactivationEvents.SetPassword -> {
+                is AccountDeactivationEvent.SetPassword -> {
                     updateFormState(formState) {
                         copy(password = event.password)
                     }
                 }
-                is AccountDeactivationEvents.DeactivateAccount ->
+                is AccountDeactivationEvent.DeactivateAccount ->
                     if (action.value.isConfirming() || event.isRetry) {
                         localCoroutineScope.deactivateAccount(
                             formState = formState.value,
@@ -55,7 +55,7 @@ class AccountDeactivationPresenter(
                     } else {
                         action.value = AsyncAction.ConfirmingNoParams
                     }
-                AccountDeactivationEvents.CloseDialogs -> {
+                AccountDeactivationEvent.CloseDialogs -> {
                     action.value = AsyncAction.Uninitialized
                 }
             }

features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/AccountDeactivationState.kt

@@ -15,7 +15,7 @@ import kotlinx.parcelize.Parcelize
 data class AccountDeactivationState(
     val deactivateFormState: DeactivateFormState,
     val accountDeactivationAction: AsyncAction<Unit>,
-    val eventSink: (AccountDeactivationEvents) -> Unit,
+    val eventSink: (AccountDeactivationEvent) -> Unit,
 ) {
     val submitEnabled: Boolean
         get() = accountDeactivationAction is AsyncAction.Uninitialized &&

features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/AccountDeactivationStatePreviewParam.kt

@@ -11,7 +11,7 @@ package io.element.android.features.logout.impl
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.libraries.architecture.AsyncAction
 
-open class AccountDeactivationStateProvider : PreviewParameterProvider<AccountDeactivationState> {
+open class AccountDeactivationStatePreviewParam : PreviewParameterProvider<AccountDeactivationState> {
     private val filledForm = aDeactivateFormState(eraseData = true, password = "password")
     override val values: Sequence<AccountDeactivationState>
         get() = sequenceOf(
@@ -45,7 +45,7 @@ internal fun aDeactivateFormState(
 internal fun anAccountDeactivationState(
     deactivateFormState: DeactivateFormState = aDeactivateFormState(),
     accountDeactivationAction: AsyncAction<Unit> = AsyncAction.Uninitialized,
-    eventSink: (AccountDeactivationEvents) -> Unit = {},
+    eventSink: (AccountDeactivationEvent) -> Unit = {},
 ) = AccountDeactivationState(
     deactivateFormState = deactivateFormState,
     accountDeactivationAction = accountDeactivationAction,

features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/AccountDeactivationView.kt

@@ -102,14 +102,14 @@ fun AccountDeactivationView(
             Content(
                 state = state,
                 onSubmitClick = {
-                    eventSink(AccountDeactivationEvents.DeactivateAccount(isRetry = false))
+                    eventSink(AccountDeactivationEvent.DeactivateAccount(isRetry = false))
                 }
             )
             Spacer(modifier = Modifier.height(32.dp))
             Buttons(
                 state = state,
                 onSubmitClick = {
-                    eventSink(AccountDeactivationEvents.DeactivateAccount(isRetry = false))
+                    eventSink(AccountDeactivationEvent.DeactivateAccount(isRetry = false))
                 }
             )
         }
@@ -117,13 +117,13 @@ fun AccountDeactivationView(
     AccountDeactivationActionDialog(
         state.accountDeactivationAction,
         onConfirmClick = {
-            eventSink(AccountDeactivationEvents.DeactivateAccount(isRetry = false))
+            eventSink(AccountDeactivationEvent.DeactivateAccount(isRetry = false))
         },
         onRetryClick = {
-            eventSink(AccountDeactivationEvents.DeactivateAccount(isRetry = true))
+            eventSink(AccountDeactivationEvent.DeactivateAccount(isRetry = true))
         },
         onDismissDialog = {
-            eventSink(AccountDeactivationEvents.CloseDialogs)
+            eventSink(AccountDeactivationEvent.CloseDialogs)
         },
     )
 }
@@ -239,7 +239,7 @@ private fun Content(
                 headline = stringResource(R.string.screen_deactivate_account_delete_all_messages),
                 value = eraseData,
                 onChange = {
-                    eventSink(AccountDeactivationEvents.SetEraseData(it))
+                    eventSink(AccountDeactivationEvent.SetEraseData(it))
                 },
                 enabled = !isLoading,
             )
@@ -275,7 +275,7 @@ private fun Content(
                 onValueChange = {
                     val sanitized = it.sanitize()
                     passwordFieldState = sanitized
-                    eventSink(AccountDeactivationEvents.SetPassword(sanitized))
+                    eventSink(AccountDeactivationEvent.SetPassword(sanitized))
                 },
                 placeholder = stringResource(CommonStrings.common_password),
                 visualTransformation = if (passwordVisible) VisualTransformation.None else PasswordVisualTransformation(),
@@ -299,16 +299,16 @@ private fun Content(
 }
 
 /**
- * Ensure that the string does not contain any new line characters, which can happen when pasting values.
+ * Ensure that the string does not contain any line separator, which can happen when pasting values.
  */
 private fun String.sanitize(): String {
-    return replace("\n", "")
+    return filterNot { it == '\n' || it == '\r' }
 }
 
 @PreviewsDayNight
 @Composable
 internal fun AccountDeactivationViewPreview(
-    @PreviewParameter(AccountDeactivationStateProvider::class) state: AccountDeactivationState,
+    @PreviewParameter(AccountDeactivationStatePreviewParam::class) state: AccountDeactivationState,
 ) = ElementPreview {
     AccountDeactivationView(
         state,

features/deactivation/impl/src/test/kotlin/io/element/android/features/logout/impl/AccountDeactivationPresenterTest.kt

@@ -47,11 +47,11 @@ class AccountDeactivationPresenterTest {
         }.test {
             val initialState = awaitItem()
             assertThat(initialState.deactivateFormState).isEqualTo(DeactivateFormState.Default)
-            initialState.eventSink(AccountDeactivationEvents.SetEraseData(true))
+            initialState.eventSink(AccountDeactivationEvent.SetEraseData(true))
             val updatedState = awaitItem()
             assertThat(updatedState.deactivateFormState).isEqualTo(DeactivateFormState.Default.copy(eraseData = true))
             assertThat(updatedState.submitEnabled).isFalse()
-            updatedState.eventSink(AccountDeactivationEvents.SetPassword("password"))
+            updatedState.eventSink(AccountDeactivationEvent.SetPassword("password"))
             val updatedState2 = awaitItem()
             assertThat(updatedState2.deactivateFormState).isEqualTo(DeactivateFormState(password = "password", eraseData = true))
             assertThat(updatedState2.submitEnabled).isTrue()
@@ -71,12 +71,12 @@ class AccountDeactivationPresenterTest {
             presenter.present()
         }.test {
             val initialState = awaitItem()
-            initialState.eventSink(AccountDeactivationEvents.SetPassword("password"))
+            initialState.eventSink(AccountDeactivationEvent.SetPassword("password"))
             skipItems(1)
-            initialState.eventSink(AccountDeactivationEvents.DeactivateAccount(isRetry = false))
+            initialState.eventSink(AccountDeactivationEvent.DeactivateAccount(isRetry = false))
             val updatedState = awaitItem()
             assertThat(updatedState.accountDeactivationAction).isEqualTo(AsyncAction.ConfirmingNoParams)
-            updatedState.eventSink(AccountDeactivationEvents.DeactivateAccount(isRetry = false))
+            updatedState.eventSink(AccountDeactivationEvent.DeactivateAccount(isRetry = false))
             val updatedState2 = awaitItem()
             assertThat(updatedState2.accountDeactivationAction).isEqualTo(AsyncAction.Loading)
             val finalState = awaitItem()
@@ -98,20 +98,20 @@ class AccountDeactivationPresenterTest {
             presenter.present()
         }.test {
             val initialState = awaitItem()
-            initialState.eventSink(AccountDeactivationEvents.SetPassword("password"))
-            initialState.eventSink(AccountDeactivationEvents.SetEraseData(true))
+            initialState.eventSink(AccountDeactivationEvent.SetPassword("password"))
+            initialState.eventSink(AccountDeactivationEvent.SetEraseData(true))
             skipItems(2)
-            initialState.eventSink(AccountDeactivationEvents.DeactivateAccount(isRetry = false))
+            initialState.eventSink(AccountDeactivationEvent.DeactivateAccount(isRetry = false))
             val updatedState = awaitItem()
             assertThat(updatedState.accountDeactivationAction).isEqualTo(AsyncAction.ConfirmingNoParams)
-            updatedState.eventSink(AccountDeactivationEvents.DeactivateAccount(isRetry = false))
+            updatedState.eventSink(AccountDeactivationEvent.DeactivateAccount(isRetry = false))
             val updatedState2 = awaitItem()
             assertThat(updatedState2.accountDeactivationAction).isEqualTo(AsyncAction.Loading)
             val finalState = awaitItem()
             assertThat(finalState.accountDeactivationAction).isEqualTo(AsyncAction.Failure(AN_EXCEPTION))
             recorder.assertions().isCalledOnce().with(value("password"), value(true))
             // Retry
-            finalState.eventSink(AccountDeactivationEvents.DeactivateAccount(isRetry = true))
+            finalState.eventSink(AccountDeactivationEvent.DeactivateAccount(isRetry = true))
             val finalState2 = awaitItem()
             assertThat(finalState2.accountDeactivationAction).isEqualTo(AsyncAction.Loading)
             assertThat(awaitItem().accountDeactivationAction).isEqualTo(AsyncAction.Failure(AN_EXCEPTION))
@@ -131,20 +131,20 @@ class AccountDeactivationPresenterTest {
             presenter.present()
         }.test {
             val initialState = awaitItem()
-            initialState.eventSink(AccountDeactivationEvents.SetPassword("password"))
-            initialState.eventSink(AccountDeactivationEvents.SetEraseData(true))
+            initialState.eventSink(AccountDeactivationEvent.SetPassword("password"))
+            initialState.eventSink(AccountDeactivationEvent.SetEraseData(true))
             skipItems(2)
-            initialState.eventSink(AccountDeactivationEvents.DeactivateAccount(isRetry = false))
+            initialState.eventSink(AccountDeactivationEvent.DeactivateAccount(isRetry = false))
             val updatedState = awaitItem()
             assertThat(updatedState.accountDeactivationAction).isEqualTo(AsyncAction.ConfirmingNoParams)
-            updatedState.eventSink(AccountDeactivationEvents.DeactivateAccount(isRetry = false))
+            updatedState.eventSink(AccountDeactivationEvent.DeactivateAccount(isRetry = false))
             val updatedState2 = awaitItem()
             assertThat(updatedState2.accountDeactivationAction).isEqualTo(AsyncAction.Loading)
             val finalState = awaitItem()
             assertThat(finalState.accountDeactivationAction).isEqualTo(AsyncAction.Failure(AN_EXCEPTION))
             recorder.assertions().isCalledOnce().with(value("password"), value(true))
             // Cancel
-            finalState.eventSink(AccountDeactivationEvents.CloseDialogs)
+            finalState.eventSink(AccountDeactivationEvent.CloseDialogs)
             val finalState2 = awaitItem()
             assertThat(finalState2.accountDeactivationAction).isEqualTo(AsyncAction.Uninitialized)
         }

features/deactivation/impl/src/test/kotlin/io/element/android/features/logout/impl/AccountDeactivationViewTest.kt

@@ -35,7 +35,7 @@ import org.robolectric.annotation.Config
 class AccountDeactivationViewTest : RobolectricTest() {
     @Test
     fun `clicking on back invokes the expected callback`() = runAndroidComposeUiTest {
-        val eventsRecorder = EventsRecorder<AccountDeactivationEvents>(expectEvents = false)
+        val eventsRecorder = EventsRecorder<AccountDeactivationEvent>(expectEvents = false)
         ensureCalledOnce {
             setAccountDeactivationView(
                 state = anAccountDeactivationState(eventSink = eventsRecorder),
@@ -48,7 +48,7 @@ class AccountDeactivationViewTest : RobolectricTest() {
     @Config(qualifiers = "h1024dp")
     @Test
     fun `clicking on Deactivate emits the expected Event`() = runAndroidComposeUiTest {
-        val eventsRecorder = EventsRecorder<AccountDeactivationEvents>()
+        val eventsRecorder = EventsRecorder<AccountDeactivationEvent>()
         setAccountDeactivationView(
             state = anAccountDeactivationState(
                 deactivateFormState = aDeactivateFormState(
@@ -58,12 +58,12 @@ class AccountDeactivationViewTest : RobolectricTest() {
             ),
         )
         clickOn(CommonStrings.action_delete)
-        eventsRecorder.assertSingle(AccountDeactivationEvents.DeactivateAccount(false))
+        eventsRecorder.assertSingle(AccountDeactivationEvent.DeactivateAccount(false))
     }
 
     @Test
     fun `clicking on Deactivate on the confirmation dialog emits the expected Event`() = runAndroidComposeUiTest {
-        val eventsRecorder = EventsRecorder<AccountDeactivationEvents>()
+        val eventsRecorder = EventsRecorder<AccountDeactivationEvent>()
         setAccountDeactivationView(
             state = anAccountDeactivationState(
                 deactivateFormState = aDeactivateFormState(
@@ -74,12 +74,12 @@ class AccountDeactivationViewTest : RobolectricTest() {
             ),
         )
         pressTag(TestTags.dialogPositive.value)
-        eventsRecorder.assertSingle(AccountDeactivationEvents.DeactivateAccount(false))
+        eventsRecorder.assertSingle(AccountDeactivationEvent.DeactivateAccount(false))
     }
 
     @Test
     fun `clicking on retry on the confirmation dialog emits the expected Event`() = runAndroidComposeUiTest {
-        val eventsRecorder = EventsRecorder<AccountDeactivationEvents>()
+        val eventsRecorder = EventsRecorder<AccountDeactivationEvent>()
         setAccountDeactivationView(
             state = anAccountDeactivationState(
                 deactivateFormState = aDeactivateFormState(
@@ -90,24 +90,24 @@ class AccountDeactivationViewTest : RobolectricTest() {
             ),
         )
         clickOn(CommonStrings.action_retry)
-        eventsRecorder.assertSingle(AccountDeactivationEvents.DeactivateAccount(true))
+        eventsRecorder.assertSingle(AccountDeactivationEvent.DeactivateAccount(true))
     }
 
     @Test
     fun `switching on the erase all switch emits the expected Event`() = runAndroidComposeUiTest {
-        val eventsRecorder = EventsRecorder<AccountDeactivationEvents>()
+        val eventsRecorder = EventsRecorder<AccountDeactivationEvent>()
         setAccountDeactivationView(
             state = anAccountDeactivationState(
                 eventSink = eventsRecorder,
             ),
         )
         clickOn(R.string.screen_deactivate_account_delete_all_messages)
-        eventsRecorder.assertSingle(AccountDeactivationEvents.SetEraseData(true))
+        eventsRecorder.assertSingle(AccountDeactivationEvent.SetEraseData(true))
     }
 
     @Test
     fun `switching off the erase all switch emits the expected Event`() = runAndroidComposeUiTest {
-        val eventsRecorder = EventsRecorder<AccountDeactivationEvents>()
+        val eventsRecorder = EventsRecorder<AccountDeactivationEvent>()
         setAccountDeactivationView(
             state = anAccountDeactivationState(
                 deactivateFormState = aDeactivateFormState(
@@ -117,13 +117,13 @@ class AccountDeactivationViewTest : RobolectricTest() {
             ),
         )
         clickOn(R.string.screen_deactivate_account_delete_all_messages)
-        eventsRecorder.assertSingle(AccountDeactivationEvents.SetEraseData(false))
+        eventsRecorder.assertSingle(AccountDeactivationEvent.SetEraseData(false))
     }
 
     @Config(qualifiers = "h1024dp")
     @Test
     fun `typing text in the password field emits the expected Event`() = runAndroidComposeUiTest {
-        val eventsRecorder = EventsRecorder<AccountDeactivationEvents>()
+        val eventsRecorder = EventsRecorder<AccountDeactivationEvent>()
         setAccountDeactivationView(
             state = anAccountDeactivationState(
                 deactivateFormState = aDeactivateFormState(
@@ -133,7 +133,7 @@ class AccountDeactivationViewTest : RobolectricTest() {
             ),
         )
         onNodeWithTag(TestTags.loginPassword.value).performTextInput("A")
-        eventsRecorder.assertSingle(AccountDeactivationEvents.SetPassword("A$A_PASSWORD"))
+        eventsRecorder.assertSingle(AccountDeactivationEvent.SetPassword("A$A_PASSWORD"))
     }
 }
 

features/enterprise/api/src/main/kotlin/io/element/android/features/enterprise/api/ClientBuilderEnterpriseHook.kt

@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.enterprise.api
+
+import io.element.android.libraries.matrix.api.MatrixClientBuilder
+import io.element.android.libraries.matrix.api.core.SessionId
+
+/**
+ * A hook that can be used to customize the [MatrixClientBuilder] for enterprise features.
+ */
+fun interface ClientBuilderEnterpriseHook {
+    suspend operator fun invoke(clientBuilder: MatrixClientBuilder, sessionId: SessionId): MatrixClientBuilder
+}

features/enterprise/api/src/main/kotlin/io/element/android/features/enterprise/api/ClientEnterpriseHook.kt

@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.enterprise.api
+
+import io.element.android.libraries.matrix.api.MatrixClient
+
+/**
+ * A hook that can be used to customize the [MatrixClient] for enterprise features.
+ */
+fun interface ClientEnterpriseHook {
+    suspend operator fun invoke(client: MatrixClient)
+}

features/enterprise/api/src/main/kotlin/io/element/android/features/enterprise/api/EnterpriseService.kt

@@ -10,7 +10,7 @@ package io.element.android.features.enterprise.api
 
 import androidx.compose.ui.graphics.Color
 import io.element.android.compound.colors.SemanticColorsLightDark
-import io.element.android.libraries.matrix.api.UrlContentFetcher
+import io.element.android.libraries.matrix.api.ClientUrlContentFetcher
 import io.element.android.libraries.matrix.api.core.SessionId
 import kotlinx.coroutines.flow.Flow
 
@@ -31,10 +31,9 @@ interface EnterpriseService {
      * Rewrites the authentication server URL when the deployment requires a different one from the one advertised.
      *
      * @param url the URL to rewrite.
-     * @param homeserver the homeserver the URL belongs to.
      * @param urlContentFetcher used to read the deployment configuration; a client that is not authenticated yet also works.
      */
-    suspend fun tweakMasUrl(url: String, homeserver: String, urlContentFetcher: UrlContentFetcher): String
+    suspend fun tweakMasUrl(url: String, urlContentFetcher: ClientUrlContentFetcher): String
 
     /**
      * Returns the list of homeservers the user is allowed to sign in to.
@@ -53,9 +52,9 @@ interface EnterpriseService {
     /**
      * Whether the given homeserver enforces the use of Element Pro or a derived app.
      *
-     * @param homeserverUrl the homeserver to check.
+     * @param serverName the homeserver to check.
      */
-    suspend fun isElementProEnforced(homeserverUrl: String): Boolean
+    suspend fun isElementProEnforced(serverName: String): Boolean
 
     /**
      * Override the brand color.
@@ -99,14 +98,6 @@ interface EnterpriseService {
      */
     fun getNoisyNotificationChannelId(sessionId: SessionId): String?
 
-    /**
-     * Gets the Element Server Suite (ESS) config endpoint URL for the given domain.
-     * Returns `null` when this build does not read its configuration from an ESS deployment.
-     *
-     * @param domain the server whose configuration endpoint is requested.
-     */
-    fun essConfigEndpointUrl(domain: String): String?
-
     companion object {
         const val ANY_ACCOUNT_PROVIDER = "*"
     }

features/enterprise/api/src/main/kotlin/io/element/android/features/enterprise/api/remoteconfig/RemoteEnterpriseConfigResult.kt

@@ -32,13 +32,13 @@ sealed interface RemoteEnterpriseConfigResult<out T> {
         is Success<T> -> data
         is Outdated<T> -> data
         is Error -> null
-        NotFound -> null
+        is NotFound -> null
     }
 
     fun upToDateDataOrNull(): T? = when (this) {
         is Success<T> -> data
         is Outdated<T> -> null
         is Error -> null
-        NotFound -> null
+        is NotFound -> null
     }
 }

features/enterprise/impl-foss/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultClientBuilderEnterpriseHook.kt

@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.enterprise.impl
+
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.features.enterprise.api.ClientBuilderEnterpriseHook
+import io.element.android.libraries.matrix.api.MatrixClientBuilder
+import io.element.android.libraries.matrix.api.core.SessionId
+
+/**
+ * Default implementation of [ClientBuilderEnterpriseHook] that does nothing for FOSS.
+ */
+@ContributesBinding(AppScope::class)
+class DefaultClientBuilderEnterpriseHook : ClientBuilderEnterpriseHook {
+    override suspend fun invoke(clientBuilder: MatrixClientBuilder, sessionId: SessionId): MatrixClientBuilder {
+        // No modification
+        return clientBuilder
+    }
+}

features/enterprise/impl-foss/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultClientEnterpriseHook.kt

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.enterprise.impl
+
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.features.enterprise.api.ClientEnterpriseHook
+import io.element.android.libraries.matrix.api.MatrixClient
+
+/**
+ * Default implementation of [ClientEnterpriseHook] that does nothing for FOSS.
+ */
+@ContributesBinding(AppScope::class)
+class DefaultClientEnterpriseHook : ClientEnterpriseHook {
+    override suspend fun invoke(client: MatrixClient) {
+        // No-op
+    }
+}

features/enterprise/impl-foss/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultEnterpriseService.kt

@@ -14,7 +14,7 @@ import dev.zacsweers.metro.ContributesBinding
 import io.element.android.compound.colors.SemanticColorsLightDark
 import io.element.android.features.enterprise.api.BugReportUrl
 import io.element.android.features.enterprise.api.EnterpriseService
-import io.element.android.libraries.matrix.api.UrlContentFetcher
+import io.element.android.libraries.matrix.api.ClientUrlContentFetcher
 import io.element.android.libraries.matrix.api.core.SessionId
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOf
@@ -22,10 +22,10 @@ import kotlinx.coroutines.flow.flowOf
 @ContributesBinding(AppScope::class)
 class DefaultEnterpriseService : EnterpriseService {
     override suspend fun isEnterpriseUser(sessionId: SessionId) = false
-    override suspend fun tweakMasUrl(url: String, homeserver: String, urlContentFetcher: UrlContentFetcher) = url
+    override suspend fun tweakMasUrl(url: String, urlContentFetcher: ClientUrlContentFetcher) = url
     override fun homeserverAllowList(): List<String> = emptyList()
     override suspend fun isAllowedToConnectToHomeserver(homeserverUrl: String) = true
-    override suspend fun isElementProEnforced(homeserverUrl: String): Boolean = false
+    override suspend fun isElementProEnforced(serverName: String): Boolean = false
 
     override suspend fun overrideBrandColor(sessionId: SessionId?, brandColor: String?) = Unit
 
@@ -45,6 +45,4 @@ class DefaultEnterpriseService : EnterpriseService {
     }
 
     override fun getNoisyNotificationChannelId(sessionId: SessionId): String? = null
-
-    override fun essConfigEndpointUrl(domain: String): String? = null
 }

features/enterprise/impl-foss/src/main/kotlin/io/element/android/features/enterprise/impl/scanner/DefaultContentScannerUrlProvider.kt

@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2026 Element Creations Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.features.enterprise.impl.scanner
-
-import dev.zacsweers.metro.AppScope
-import dev.zacsweers.metro.ContributesBinding
-import io.element.android.libraries.matrix.api.UrlContentFetcher
-import io.element.android.libraries.matrix.api.core.SessionId
-import io.element.android.libraries.matrix.api.scanner.ContentScannerUrlProvider
-
-/**
- * Default FOSS implementation of [ContentScannerUrlProvider] that returns `null` for the content scanner URL.
- */
-@ContributesBinding(AppScope::class)
-class DefaultContentScannerUrlProvider : ContentScannerUrlProvider {
-    override suspend fun getContentScannerUrl(sessionId: SessionId): Result<String?> = Result.success(null)
-
-    @ContributesBinding(AppScope::class)
-    class Factory : ContentScannerUrlProvider.Factory {
-        override fun create(urlContentFetcher: UrlContentFetcher): ContentScannerUrlProvider {
-            return DefaultContentScannerUrlProvider()
-        }
-    }
-}

features/enterprise/test/src/main/kotlin/io/element/android/features/enterprise/test/FakeEnterpriseService.kt

@@ -12,7 +12,7 @@ import androidx.compose.ui.graphics.Color
 import io.element.android.compound.colors.SemanticColorsLightDark
 import io.element.android.features.enterprise.api.BugReportUrl
 import io.element.android.features.enterprise.api.EnterpriseService
-import io.element.android.libraries.matrix.api.UrlContentFetcher
+import io.element.android.libraries.matrix.api.ClientUrlContentFetcher
 import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.tests.testutils.lambda.lambdaError
 import io.element.android.tests.testutils.simulateLongTask
@@ -30,8 +30,7 @@ class FakeEnterpriseService(
     private val firebasePushGatewayResult: () -> String? = { lambdaError() },
     private val unifiedPushDefaultPushGatewayResult: () -> String? = { lambdaError() },
     private val getNoisyNotificationChannelIdResult: (SessionId?) -> String? = { lambdaError() },
-    private val tweakMasUrlResult: (String, String, UrlContentFetcher) -> String = { _, _, _ -> lambdaError() },
-    private val essConfigEndpointUrlResult: (String) -> String = { lambdaError() },
+    private val tweakMasUrlResult: (String, ClientUrlContentFetcher) -> String = { _, _ -> lambdaError() },
     private val isElementProEnforcedResult: (String) -> Boolean = { lambdaError() },
 ) : EnterpriseService {
     private val brandColorState = MutableStateFlow(initialBrandColor)
@@ -41,8 +40,8 @@ class FakeEnterpriseService(
         isEnterpriseUserResult(sessionId)
     }
 
-    override suspend fun tweakMasUrl(url: String, homeserver: String, urlContentFetcher: UrlContentFetcher): String = simulateLongTask {
-        tweakMasUrlResult(url, homeserver, urlContentFetcher)
+    override suspend fun tweakMasUrl(url: String, urlContentFetcher: ClientUrlContentFetcher): String = simulateLongTask {
+        tweakMasUrlResult(url, urlContentFetcher)
     }
 
     override fun homeserverAllowList(): List<String> {
@@ -53,8 +52,8 @@ class FakeEnterpriseService(
         isAllowedToConnectToHomeserverResult(homeserverUrl)
     }
 
-    override suspend fun isElementProEnforced(homeserverUrl: String): Boolean = simulateLongTask {
-        isElementProEnforcedResult(homeserverUrl)
+    override suspend fun isElementProEnforced(serverName: String): Boolean = simulateLongTask {
+        isElementProEnforcedResult(serverName)
     }
 
     override suspend fun overrideBrandColor(sessionId: SessionId?, brandColor: String?) = simulateLongTask {
@@ -85,8 +84,4 @@ class FakeEnterpriseService(
     override fun getNoisyNotificationChannelId(sessionId: SessionId): String? {
         return getNoisyNotificationChannelIdResult(sessionId)
     }
-
-    override fun essConfigEndpointUrl(domain: String): String {
-        return essConfigEndpointUrlResult(domain)
-    }
 }

features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesEvent.kt

@@ -8,6 +8,6 @@
 
 package io.element.android.features.forward.impl
 
-sealed interface ForwardMessagesEvents {
-    data object ClearError : ForwardMessagesEvents
+sealed interface ForwardMessagesEvent {
+    data object ClearError : ForwardMessagesEvent
 }

features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesPresenter.kt

@@ -48,9 +48,9 @@ class ForwardMessagesPresenter(
 
     @Composable
     override fun present(): ForwardMessagesState {
-        fun handleEvent(event: ForwardMessagesEvents) {
+        fun handleEvent(event: ForwardMessagesEvent) {
             when (event) {
-                ForwardMessagesEvents.ClearError -> forwardingActionState.value = AsyncAction.Uninitialized
+                ForwardMessagesEvent.ClearError -> forwardingActionState.value = AsyncAction.Uninitialized
             }
         }
 

features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesState.kt

@@ -13,5 +13,5 @@ import io.element.android.libraries.matrix.api.core.RoomId
 
 data class ForwardMessagesState(
     val forwardAction: AsyncAction<List<RoomId>>,
-    val eventSink: (ForwardMessagesEvents) -> Unit
+    val eventSink: (ForwardMessagesEvent) -> Unit
 )

features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesStatePreviewParam.kt

@@ -12,7 +12,7 @@ import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.matrix.api.core.RoomId
 
-open class ForwardMessagesStateProvider : PreviewParameterProvider<ForwardMessagesState> {
+open class ForwardMessagesStatePreviewParam : PreviewParameterProvider<ForwardMessagesState> {
     override val values: Sequence<ForwardMessagesState>
         get() = sequenceOf(
             aForwardMessagesState(),
@@ -32,7 +32,7 @@ open class ForwardMessagesStateProvider : PreviewParameterProvider<ForwardMessag
 
 fun aForwardMessagesState(
     forwardAction: AsyncAction<List<RoomId>> = AsyncAction.Uninitialized,
-    eventSink: (ForwardMessagesEvents) -> Unit = {}
+    eventSink: (ForwardMessagesEvent) -> Unit = {}
 ) = ForwardMessagesState(
     forwardAction = forwardAction,
     eventSink = eventSink

features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesView.kt

@@ -31,14 +31,14 @@ fun ForwardMessagesView(
             stringResource(id = CommonStrings.error_unknown)
         },
         onErrorDismiss = {
-            state.eventSink(ForwardMessagesEvents.ClearError)
+            state.eventSink(ForwardMessagesEvent.ClearError)
         },
     )
 }
 
 @PreviewsDayNight
 @Composable
-internal fun ForwardMessagesViewPreview(@PreviewParameter(ForwardMessagesStateProvider::class) state: ForwardMessagesState) = ElementPreview {
+internal fun ForwardMessagesViewPreview(@PreviewParameter(ForwardMessagesStatePreviewParam::class) state: ForwardMessagesState) = ElementPreview {
     ForwardMessagesView(
         state = state,
         onForwardSuccess = {}

features/forward/impl/src/test/kotlin/io/element/android/features/forward/impl/ForwardMessagesPresenterTest.kt

@@ -86,7 +86,7 @@ class ForwardMessagesPresenterTest {
             val failedForwardState = awaitItem()
             assertThat(failedForwardState.forwardAction.isFailure()).isTrue()
             // Then clear error
-            failedForwardState.eventSink(ForwardMessagesEvents.ClearError)
+            failedForwardState.eventSink(ForwardMessagesEvent.ClearError)
             assertThat(awaitItem().forwardAction.isUninitialized()).isTrue()
             forwardEventLambda.assertions().isCalledOnce()
         }

features/forward/impl/src/test/kotlin/io/element/android/features/forward/impl/ForwardMessagesViewTest.kt

@@ -29,7 +29,7 @@ import org.junit.Test
 class ForwardMessagesViewTest : RobolectricTest() {
     @Test
     fun `cancel error emits the expected event`() = runAndroidComposeUiTest {
-        val eventsRecorder = EventsRecorder<ForwardMessagesEvents>()
+        val eventsRecorder = EventsRecorder<ForwardMessagesEvent>()
         setForwardMessagesView(
             aForwardMessagesState(
                 forwardAction = AsyncAction.Failure(AN_EXCEPTION),
@@ -37,13 +37,13 @@ class ForwardMessagesViewTest : RobolectricTest() {
             ),
         )
         pressTag(TestTags.dialogPositive.value)
-        eventsRecorder.assertSingle(ForwardMessagesEvents.ClearError)
+        eventsRecorder.assertSingle(ForwardMessagesEvent.ClearError)
     }
 
     @Test
     fun `success invokes onForwardSuccess`() = runAndroidComposeUiTest {
         val data = listOf(A_ROOM_ID)
-        val eventsRecorder = EventsRecorder<ForwardMessagesEvents>(expectEvents = false)
+        val eventsRecorder = EventsRecorder<ForwardMessagesEvent>(expectEvents = false)
         ensureCalledOnceWithParam<List<RoomId>?>(data) { callback ->
             setForwardMessagesView(
                 aForwardMessagesState(

features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/di/FtueBindingContainer.kt

@@ -18,7 +18,7 @@ import io.element.android.libraries.di.SessionScope
 
 @ContributesTo(SessionScope::class)
 @BindingContainer
-interface FtueModule {
+interface FtueBindingContainer {
     @Binds
-    fun bindChooseSelfVerificationMethodPresenter(presenter: ChooseSelfVerificationModePresenter): Presenter<ChooseSelfVerificationModeState>
+    fun bindChooseSelfVerificationModePresenter(presenter: ChooseSelfVerificationModePresenter): Presenter<ChooseSelfVerificationModeState>
 }

features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/notifications/NotificationsOptInEvent.kt

@@ -8,7 +8,7 @@
 
 package io.element.android.features.ftue.impl.notifications
 
-sealed interface NotificationsOptInEvents {
-    data object ContinueClicked : NotificationsOptInEvents
-    data object NotNowClicked : NotificationsOptInEvents
+sealed interface NotificationsOptInEvent {
+    data object ContinueClicked : NotificationsOptInEvent
+    data object NotNowClicked : NotificationsOptInEvent
 }

features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/notifications/NotificationsOptInPresenter.kt

@@ -52,16 +52,16 @@ class NotificationsOptInPresenter(
     override fun present(): NotificationsOptInState {
         val notificationsPermissionsState = postNotificationPermissionsPresenter.present()
 
-        fun handleEvent(event: NotificationsOptInEvents) {
+        fun handleEvent(event: NotificationsOptInEvent) {
             when (event) {
-                NotificationsOptInEvents.ContinueClicked -> {
+                NotificationsOptInEvent.ContinueClicked -> {
                     if (notificationsPermissionsState.permissionGranted) {
                         callback.onNotificationsOptInFinished()
                     } else {
                         notificationsPermissionsState.eventSink(PermissionsEvent.RequestPermissions)
                     }
                 }
-                NotificationsOptInEvents.NotNowClicked -> {
+                NotificationsOptInEvent.NotNowClicked -> {
                     if (buildVersionSdkIntProvider.isAtLeast(Build.VERSION_CODES.TIRAMISU)) {
                         appCoroutineScope.setPermissionDenied()
                     }

features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/notifications/NotificationsOptInState.kt

@@ -12,5 +12,5 @@ import io.element.android.libraries.permissions.api.PermissionsState
 
 data class NotificationsOptInState(
     val notificationsPermissionState: PermissionsState,
-    val eventSink: (NotificationsOptInEvents) -> Unit
+    val eventSink: (NotificationsOptInEvent) -> Unit
 )

features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/notifications/NotificationsOptInStatePreviewParam.kt

@@ -11,7 +11,7 @@ package io.element.android.features.ftue.impl.notifications
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.libraries.permissions.api.aPermissionsState
 
-open class NotificationsOptInStateProvider : PreviewParameterProvider<NotificationsOptInState> {
+open class NotificationsOptInStatePreviewParam : PreviewParameterProvider<NotificationsOptInState> {
     override val values: Sequence<NotificationsOptInState>
         get() = sequenceOf(
             aNotificationsOptInState(),

features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/notifications/NotificationsOptInView.kt

@@ -86,14 +86,14 @@ private fun NotificationsOptInFooter(state: NotificationsOptInState) {
             modifier = Modifier.fillMaxWidth(),
             text = stringResource(CommonStrings.action_ok),
             onClick = {
-                state.eventSink(NotificationsOptInEvents.ContinueClicked)
+                state.eventSink(NotificationsOptInEvent.ContinueClicked)
             }
         )
         TextButton(
             modifier = Modifier.fillMaxWidth(),
             text = stringResource(CommonStrings.action_not_now),
             onClick = {
-                state.eventSink(NotificationsOptInEvents.NotNowClicked)
+                state.eventSink(NotificationsOptInEvent.NotNowClicked)
             }
         )
     }
@@ -178,7 +178,7 @@ private fun NotificationRow(
 @PreviewsDayNight
 @Composable
 internal fun NotificationsOptInViewPreview(
-    @PreviewParameter(NotificationsOptInStateProvider::class) state: NotificationsOptInState
+    @PreviewParameter(NotificationsOptInStatePreviewParam::class) state: NotificationsOptInState
 ) {
     ElementPreview {
         NotificationsOptInView(

features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModePresenter.kt

@@ -15,7 +15,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.produceState
 import androidx.compose.runtime.remember
 import dev.zacsweers.metro.Inject
-import io.element.android.features.logout.api.direct.DirectLogoutEvents
+import io.element.android.features.logout.api.direct.DirectLogoutEvent
 import io.element.android.features.logout.api.direct.DirectLogoutState
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.architecture.Presenter
@@ -67,7 +67,7 @@ class ChooseSelfVerificationModePresenter(
 
         fun handleEvent(event: ChooseSelfVerificationModeEvent) {
             when (event) {
-                ChooseSelfVerificationModeEvent.SignOut -> directLogoutState.eventSink(DirectLogoutEvents.Logout(ignoreSdkError = false))
+                ChooseSelfVerificationModeEvent.SignOut -> directLogoutState.eventSink(DirectLogoutEvent.Logout(ignoreSdkError = false))
             }
         }
 

features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeStatePreviewParam.kt

@@ -12,7 +12,7 @@ import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.features.logout.api.direct.aDirectLogoutState
 import io.element.android.libraries.architecture.AsyncData
 
-class ChooseSelfVerificationModeStateProvider :
+class ChooseSelfVerificationModeStatePreviewParam :
     PreviewParameterProvider<ChooseSelfVerificationModeState> {
     override val values = sequenceOf(
         aChooseSelfVerificationModeState(

features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeView.kt

@@ -149,7 +149,7 @@ private fun ChooseSelfVerificationModeButtons(
 @PreviewsDayNight
 @Composable
 internal fun ChooseSelfVerificationModeViewPreview(
-    @PreviewParameter(ChooseSelfVerificationModeStateProvider::class) state: ChooseSelfVerificationModeState
+    @PreviewParameter(ChooseSelfVerificationModeStatePreviewParam::class) state: ChooseSelfVerificationModeState
 ) = ElementPreview {
     ChooseSelfVerificationModeView(
         state = state,

features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/notifications/NotificationsOptInPresenterTest.kt

@@ -55,7 +55,7 @@ class NotificationsOptInPresenterTest {
             presenter.present()
         }.test {
             val initialState = awaitItem()
-            initialState.eventSink(NotificationsOptInEvents.ContinueClicked)
+            initialState.eventSink(NotificationsOptInEvent.ContinueClicked)
             assertThat(awaitItem().notificationsPermissionState.showDialog).isTrue()
         }
     }
@@ -70,7 +70,7 @@ class NotificationsOptInPresenterTest {
             presenter.present()
         }.test {
             val initialState = awaitItem()
-            initialState.eventSink(NotificationsOptInEvents.ContinueClicked)
+            initialState.eventSink(NotificationsOptInEvent.ContinueClicked)
             assertThat(isFinished).isTrue()
         }
     }
@@ -86,7 +86,7 @@ class NotificationsOptInPresenterTest {
             presenter.present()
         }.test {
             val initialState = awaitItem()
-            initialState.eventSink(NotificationsOptInEvents.NotNowClicked)
+            initialState.eventSink(NotificationsOptInEvent.NotNowClicked)
             assertThat(isFinished).isTrue()
         }
     }
@@ -105,7 +105,7 @@ class NotificationsOptInPresenterTest {
             presenter.present()
         }.test {
             val initialState = awaitItem()
-            initialState.eventSink(NotificationsOptInEvents.NotNowClicked)
+            initialState.eventSink(NotificationsOptInEvent.NotNowClicked)
 
             // Allow background coroutines to run
             runCurrent()

features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSessionVerificationModePresenterTest.kt

@@ -9,7 +9,7 @@
 package io.element.android.features.ftue.impl.sessionverification.choosemode
 
 import com.google.common.truth.Truth.assertThat
-import io.element.android.features.logout.api.direct.DirectLogoutEvents
+import io.element.android.features.logout.api.direct.DirectLogoutEvent
 import io.element.android.features.logout.api.direct.DirectLogoutState
 import io.element.android.features.logout.api.direct.aDirectLogoutState
 import io.element.android.libraries.architecture.AsyncData
@@ -112,7 +112,7 @@ class ChooseSessionVerificationModePresenterTest {
 
     @Test
     fun `sing out action triggers a direct logout`() = runTest {
-        val logoutEventRecorder = lambdaRecorder<DirectLogoutEvents, Unit> {}
+        val logoutEventRecorder = lambdaRecorder<DirectLogoutEvent, Unit> {}
         val logoutPresenter = Presenter<DirectLogoutState> {
             aDirectLogoutState(eventSink = logoutEventRecorder)
         }
@@ -121,7 +121,7 @@ class ChooseSessionVerificationModePresenterTest {
             val initial = awaitItem()
             initial.eventSink(ChooseSelfVerificationModeEvent.SignOut)
             logoutEventRecorder.assertions().isCalledOnce()
-                .with(value(DirectLogoutEvents.Logout(ignoreSdkError = false)))
+                .with(value(DirectLogoutEvent.Logout(ignoreSdkError = false)))
         }
     }
 

features/home/api/src/main/kotlin/io/element/android/features/home/api/HomeEntryPoint.kt

@@ -12,6 +12,7 @@ import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
 import io.element.android.libraries.architecture.FeatureEntryPoint
+import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.room.JoinedRoom
 
@@ -23,7 +24,7 @@ interface HomeEntryPoint : FeatureEntryPoint {
     ): Node
 
     interface Callback : Plugin {
-        fun navigateToRoom(roomId: RoomId, joinedRoom: JoinedRoom?)
+        fun navigateToRoom(roomId: RoomId, eventId: EventId?, joinedRoom: JoinedRoom?)
         fun navigateToCreateRoom()
         fun navigateToCreateSpace()
         fun navigateToSettings()

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeFlowNode.kt

@@ -56,6 +56,7 @@ import io.element.android.libraries.designsystem.utils.DelayedVisibility
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.di.annotations.SessionCoroutineScope
 import io.element.android.libraries.matrix.api.MatrixClient
+import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.services.analytics.api.AnalyticsService
 import kotlinx.coroutines.CoroutineScope
@@ -183,6 +184,7 @@ class HomeFlowNode(
 
             fun navigateToRoom(
                 roomId: RoomId,
+                eventId: EventId?,
             ) {
                 if (!loadingJoinedRoomJob.value.isUninitialized()) {
                     Timber.w("Already loading a room, ignoring navigateToRoom for $roomId")
@@ -195,7 +197,7 @@ class HomeFlowNode(
                     }.fold(
                         onSuccess = { joinedRoom ->
                             if (isActive) {
-                                callback.navigateToRoom(roomId, joinedRoom)
+                                callback.navigateToRoom(roomId = roomId, eventId = eventId, joinedRoom = joinedRoom)
                                 loadingJoinedRoomJob.value = AsyncData.Success(coroutineContext.job)
                                 // Wait a bit before resetting the state to avoid allowing to open several rooms
                                 delay(200.milliseconds)
@@ -205,7 +207,7 @@ class HomeFlowNode(
                         onFailure = {
                             // If the operation wasn't cancelled, navigate without the room, using the room id
                             if (it !is CancellationException) {
-                                callback.navigateToRoom(roomId, null)
+                                callback.navigateToRoom(roomId = roomId, eventId = null, joinedRoom = null)
                             }
                             loadingJoinedRoomJob.value = AsyncData.Failure(error = it, prevData = coroutineContext.job)
                             // Wait a bit before resetting the state to avoid allowing to open several rooms
@@ -233,7 +235,7 @@ class HomeFlowNode(
                 acceptDeclineInviteView = {
                     acceptDeclineInviteView.Render(
                         state = state.roomListState.acceptDeclineInviteState,
-                        onAcceptInviteSuccess = ::navigateToRoom,
+                        onAcceptInviteSuccess = { navigateToRoom(roomId = it, eventId = null) },
                         onDeclineInviteSuccess = { },
                         modifier = Modifier
                     )
@@ -269,6 +271,11 @@ class HomeFlowNode(
                     parentNode = this,
                     buildContext = buildContext,
                     inviteData = navTarget.inviteData,
+                    callback = object : DeclineInviteAndBlockEntryPoint.Callback {
+                        override fun onDeclineSuccess() {
+                            backstack.pop()
+                        }
+                    },
                 )
             }
             is NavTarget.SelectNewOwnersWhenLeavingRoom -> {

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeStatePreviewParam.kt

@@ -10,7 +10,7 @@ package io.element.android.features.home.impl
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.features.home.impl.roomlist.RoomListState
-import io.element.android.features.home.impl.roomlist.RoomListStateProvider
+import io.element.android.features.home.impl.roomlist.RoomListStatePreviewParam
 import io.element.android.features.home.impl.roomlist.aRoomListState
 import io.element.android.features.home.impl.roomlist.aRoomsContentState
 import io.element.android.features.home.impl.roomlist.generateRoomListRoomSummaryList
@@ -24,7 +24,7 @@ import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.ui.strings.CommonStrings
 import kotlinx.collections.immutable.toImmutableList
 
-open class HomeStateProvider : PreviewParameterProvider<HomeState> {
+open class HomeStatePreviewParam : PreviewParameterProvider<HomeState> {
     override val values: Sequence<HomeState>
         get() = sequenceOf(
             aHomeState(),
@@ -43,7 +43,7 @@ open class HomeStateProvider : PreviewParameterProvider<HomeState> {
             aHomeState(
                 currentHomeNavigationBarItem = HomeNavigationBarItem.Spaces,
             ),
-        ) + RoomListStateProvider().values.map {
+        ) + RoomListStatePreviewParam().values.map {
             aHomeState(roomListState = it)
         } + aHomeState(
             currentHomeNavigationBarItem = HomeNavigationBarItem.Spaces,

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeView.kt

@@ -55,6 +55,8 @@ import io.element.android.features.home.impl.roomlist.RoomListContextMenu
 import io.element.android.features.home.impl.roomlist.RoomListDeclineInviteMenu
 import io.element.android.features.home.impl.roomlist.RoomListEvent
 import io.element.android.features.home.impl.roomlist.RoomListState
+import io.element.android.features.home.impl.search.GlobalSearchEvent
+import io.element.android.features.home.impl.search.GlobalSearchView
 import io.element.android.features.home.impl.search.RoomListSearchView
 import io.element.android.features.home.impl.spacefilters.SpaceFiltersEvent
 import io.element.android.features.home.impl.spacefilters.SpaceFiltersState
@@ -73,6 +75,7 @@ import io.element.android.libraries.designsystem.utils.lazyColumnContentPadding
 import io.element.android.libraries.designsystem.utils.scaffoldScrollableContentInsets
 import io.element.android.libraries.designsystem.utils.snackbar.SnackbarHost
 import io.element.android.libraries.designsystem.utils.snackbar.rememberSnackbarHostState
+import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.ui.strings.CommonStrings
 import kotlinx.coroutines.launch
@@ -80,7 +83,7 @@ import kotlinx.coroutines.launch
 @Composable
 fun HomeView(
     homeState: HomeState,
-    onRoomClick: (RoomId) -> Unit,
+    onRoomClick: (RoomId, EventId?) -> Unit,
     onSettingsClick: () -> Unit,
     onSetUpRecoveryClick: () -> Unit,
     onConfirmRecoveryKeyClick: () -> Unit,
@@ -122,22 +125,34 @@ fun HomeView(
             state = homeState,
             onSetUpRecoveryClick = onSetUpRecoveryClick,
             onConfirmRecoveryKeyClick = onConfirmRecoveryKeyClick,
-            onRoomClick = { if (firstThrottler.canHandle()) onRoomClick(it) },
+            onRoomClick = { roomId -> if (firstThrottler.canHandle()) onRoomClick(roomId, null) },
             onOpenSettings = { if (firstThrottler.canHandle()) onSettingsClick() },
             onStartChatClick = { if (firstThrottler.canHandle()) onStartChatClick() },
             onCreateSpaceClick = { if (firstThrottler.canHandle()) onCreateSpaceClick() },
             onMenuActionClick = onMenuActionClick,
         )
-        // This overlaid view will only be visible when state.displaySearchResults is true
-        RoomListSearchView(
-            state = state.searchState,
-            eventSink = state.eventSink,
-            hideInvitesAvatars = state.hideInvitesAvatars,
-            onRoomClick = { if (firstThrottler.canHandle()) onRoomClick(it) },
-            modifier = Modifier
-                .fillMaxSize()
-                .background(ElementTheme.colors.bgCanvasDefault)
-        )
+
+        if (state.globalSearchState.isEnabled) {
+            GlobalSearchView(
+                state = state.globalSearchState,
+                onSelectSearchResult = { roomId, eventId -> if (firstThrottler.canHandle()) onRoomClick(roomId, eventId) },
+                modifier = Modifier
+                    .fillMaxSize()
+                    .background(ElementTheme.colors.bgCanvasDefault),
+            )
+        } else {
+            // This overlaid view will only be visible when state.displaySearchResults is true
+            RoomListSearchView(
+                state = state.searchState,
+                eventSink = state.eventSink,
+                hideInvitesAvatars = state.hideInvitesAvatars,
+                onRoomClick = { roomId -> if (firstThrottler.canHandle()) onRoomClick(roomId, null) },
+                modifier = Modifier
+                    .fillMaxSize()
+                    .background(ElementTheme.colors.bgCanvasDefault)
+            )
+        }
+
         acceptDeclineInviteView()
     }
 }
@@ -186,8 +201,18 @@ private fun HomeScaffold(
                 selectedNavigationItem = state.currentHomeNavigationBarItem,
                 currentUserAndNeighbors = state.currentUserAndNeighbors,
                 showAvatarIndicator = state.showAvatarIndicator,
-                areSearchResultsDisplayed = roomListState.searchState.isSearchActive,
-                onToggleSearch = { roomListState.eventSink(RoomListEvent.ToggleSearchResults) },
+                areSearchResultsDisplayed = if (roomListState.globalSearchState.isEnabled) {
+                    roomListState.globalSearchState.isSearchActive
+                } else {
+                    roomListState.searchState.isSearchActive
+                },
+                onToggleSearch = {
+                    if (roomListState.globalSearchState.isEnabled) {
+                        roomListState.globalSearchState.eventSink(GlobalSearchEvent.ToggleSearchVisibility)
+                    } else {
+                        roomListState.eventSink(RoomListEvent.ToggleSearchResults)
+                    }
+                },
                 onMenuActionClick = onMenuActionClick,
                 onOpenSettings = onOpenSettings,
                 onAccountSwitch = {
@@ -346,10 +371,10 @@ internal fun RoomListRoomSummary.contentType() = displayType.ordinal
 
 @PreviewsDayNight
 @Composable
-internal fun HomeViewPreview(@PreviewParameter(HomeStateProvider::class) state: HomeState) = ElementPreview {
+internal fun HomeViewPreview(@PreviewParameter(HomeStatePreviewParam::class) state: HomeState) = ElementPreview {
     HomeView(
         homeState = state,
-        onRoomClick = {},
+        onRoomClick = { _, _ -> },
         onSettingsClick = {},
         onSetUpRecoveryClick = {},
         onConfirmRecoveryKeyClick = {},
@@ -369,7 +394,7 @@ internal fun HomeViewPreview(@PreviewParameter(HomeStateProvider::class) state:
 internal fun HomeViewA11yPreview() = ElementPreview {
     HomeView(
         homeState = aHomeState(),
-        onRoomClick = {},
+        onRoomClick = { _, _ -> },
         onSettingsClick = {},
         onSetUpRecoveryClick = {},
         onConfirmRecoveryKeyClick = {},

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/BatteryOptimizationBanner.kt

@@ -16,7 +16,7 @@ import io.element.android.libraries.designsystem.components.Announcement
 import io.element.android.libraries.designsystem.components.AnnouncementType
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
-import io.element.android.libraries.push.api.battery.BatteryOptimizationEvents
+import io.element.android.libraries.push.api.battery.BatteryOptimizationEvent
 import io.element.android.libraries.push.api.battery.BatteryOptimizationState
 import io.element.android.libraries.push.api.battery.aBatteryOptimizationState
 
@@ -31,8 +31,8 @@ internal fun BatteryOptimizationBanner(
         description = stringResource(R.string.banner_battery_optimization_content_android),
         type = AnnouncementType.Actionable(
             actionText = stringResource(R.string.banner_battery_optimization_submit_android),
-            onActionClick = { state.eventSink(BatteryOptimizationEvents.RequestDisableOptimizations) },
-            onDismissClick = { state.eventSink(BatteryOptimizationEvents.Dismiss) },
+            onActionClick = { state.eventSink(BatteryOptimizationEvent.RequestDisableOptimizations) },
+            onDismissClick = { state.eventSink(BatteryOptimizationEvent.Dismiss) },
         ),
     )
 }

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/FullScreenIntentPermissionBanner.kt

@@ -16,7 +16,7 @@ import io.element.android.libraries.designsystem.components.Announcement
 import io.element.android.libraries.designsystem.components.AnnouncementType
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
-import io.element.android.libraries.fullscreenintent.api.FullScreenIntentPermissionsEvents
+import io.element.android.libraries.fullscreenintent.api.FullScreenIntentPermissionsEvent
 import io.element.android.libraries.fullscreenintent.api.FullScreenIntentPermissionsState
 import io.element.android.libraries.fullscreenintent.api.aFullScreenIntentPermissionsState
 import io.element.android.libraries.ui.strings.CommonStrings
@@ -31,8 +31,8 @@ fun FullScreenIntentPermissionBanner(
         description = stringResource(R.string.full_screen_intent_banner_message),
         type = AnnouncementType.Actionable(
             actionText = stringResource(CommonStrings.action_continue),
-            onDismissClick = { state.eventSink(FullScreenIntentPermissionsEvents.Dismiss) },
-            onActionClick = { state.eventSink(FullScreenIntentPermissionsEvents.OpenSettings) },
+            onDismissClick = { state.eventSink(FullScreenIntentPermissionsEvent.Dismiss) },
+            onActionClick = { state.eventSink(FullScreenIntentPermissionsEvent.OpenSettings) },
         ),
         modifier = modifier.roomListBannerPadding(),
     )

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomListContentView.kt

@@ -42,7 +42,7 @@ import io.element.android.features.home.impl.filters.selection.FilterSelectionSt
 import io.element.android.features.home.impl.model.RoomListRoomSummary
 import io.element.android.features.home.impl.model.RoomSummaryDisplayType
 import io.element.android.features.home.impl.roomlist.RoomListContentState
-import io.element.android.features.home.impl.roomlist.RoomListContentStateProvider
+import io.element.android.features.home.impl.roomlist.RoomListContentStatePreviewParam
 import io.element.android.features.home.impl.roomlist.RoomListEvent
 import io.element.android.features.home.impl.roomlist.SecurityBannerState
 import io.element.android.features.home.impl.spacefilters.SpaceFiltersState
@@ -336,7 +336,7 @@ private fun EmptyScaffold(
 
 @PreviewsDayNight
 @Composable
-internal fun RoomListContentViewPreview(@PreviewParameter(RoomListContentStateProvider::class) state: RoomListContentState) = ElementPreview {
+internal fun RoomListContentViewPreview(@PreviewParameter(RoomListContentStatePreviewParam::class) state: RoomListContentState) = ElementPreview {
     RoomListContentView(
         contentState = state,
         filtersState = aRoomListFiltersState(

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomSummaryRow.kt

@@ -43,7 +43,7 @@ import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.features.home.impl.R
 import io.element.android.features.home.impl.model.LatestEvent
 import io.element.android.features.home.impl.model.RoomListRoomSummary
-import io.element.android.features.home.impl.model.RoomListRoomSummaryProvider
+import io.element.android.features.home.impl.model.RoomListRoomSummaryPreviewParam
 import io.element.android.features.home.impl.model.RoomSummaryDisplayType
 import io.element.android.features.home.impl.roomlist.RoomListEvent
 import io.element.android.libraries.core.extensions.orEmpty
@@ -449,7 +449,7 @@ private fun MentionIndicatorAtom() {
 
 @PreviewsDayNight
 @Composable
-internal fun RoomSummaryRowPreview(@PreviewParameter(RoomListRoomSummaryProvider::class) data: RoomListRoomSummary) = ElementPreview {
+internal fun RoomSummaryRowPreview(@PreviewParameter(RoomListRoomSummaryPreviewParam::class) data: RoomListRoomSummary) = ElementPreview {
     RoomSummaryRow(
         room = data,
         hideInviteAvatars = false,

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/di/HomeSpacesBindingContainer.kt

@@ -18,7 +18,7 @@ import io.element.android.libraries.di.SessionScope
 
 @BindingContainer
 @ContributesTo(SessionScope::class)
-interface HomeSpacesModule {
+interface HomeSpacesBindingContainer {
     @Binds
     fun bindHomeSpacesPresenter(presenter: HomeSpacesPresenter): Presenter<HomeSpacesState>
 }

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/di/RoomListBindingContainer.kt

@@ -15,6 +15,8 @@ import io.element.android.features.home.impl.filters.RoomListFiltersPresenter
 import io.element.android.features.home.impl.filters.RoomListFiltersState
 import io.element.android.features.home.impl.roomlist.RoomListPresenter
 import io.element.android.features.home.impl.roomlist.RoomListState
+import io.element.android.features.home.impl.search.GlobalSearchPresenter
+import io.element.android.features.home.impl.search.GlobalSearchState
 import io.element.android.features.home.impl.search.RoomListSearchPresenter
 import io.element.android.features.home.impl.search.RoomListSearchState
 import io.element.android.features.home.impl.spacefilters.SpaceFiltersPresenter
@@ -24,16 +26,19 @@ import io.element.android.libraries.di.SessionScope
 
 @ContributesTo(SessionScope::class)
 @BindingContainer
-interface RoomListModule {
+interface RoomListBindingContainer {
     @Binds
     fun bindRoomListPresenter(presenter: RoomListPresenter): Presenter<RoomListState>
 
     @Binds
-    fun bindSearchPresenter(presenter: RoomListSearchPresenter): Presenter<RoomListSearchState>
+    fun bindRoomListSearchPresenter(presenter: RoomListSearchPresenter): Presenter<RoomListSearchState>
 
     @Binds
-    fun bindFiltersPresenter(presenter: RoomListFiltersPresenter): Presenter<RoomListFiltersState>
+    fun bindRoomListFiltersPresenter(presenter: RoomListFiltersPresenter): Presenter<RoomListFiltersState>
 
     @Binds
     fun bindSpaceFiltersPresenter(presenter: SpaceFiltersPresenter): Presenter<SpaceFiltersState>
+
+    @Binds
+    fun bindGlobalSearchPresenter(presenter: GlobalSearchPresenter): Presenter<GlobalSearchState>
 }

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersStatePreviewParam.kt

@@ -12,7 +12,7 @@ import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.features.home.impl.filters.selection.FilterSelectionState
 import kotlinx.collections.immutable.toImmutableList
 
-class RoomListFiltersStateProvider : PreviewParameterProvider<RoomListFiltersState> {
+class RoomListFiltersStatePreviewParam : PreviewParameterProvider<RoomListFiltersState> {
     override val values: Sequence<RoomListFiltersState>
         get() = sequenceOf(
             aRoomListFiltersState(),

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersView.kt

@@ -212,7 +212,7 @@ private fun RoomListFilterView(
 
 @PreviewsDayNight
 @Composable
-internal fun RoomListFiltersViewPreview(@PreviewParameter(RoomListFiltersStateProvider::class) state: RoomListFiltersState) = ElementPreview {
+internal fun RoomListFiltersViewPreview(@PreviewParameter(RoomListFiltersStatePreviewParam::class) state: RoomListFiltersState) = ElementPreview {
     RoomListFiltersView(
         modifier = Modifier.padding(vertical = 4.dp),
         state = state,

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/RoomListRoomSummaryPreviewParam.kt

@@ -24,7 +24,7 @@ import io.element.android.libraries.matrix.api.user.DisplayedStatus
 import io.element.android.libraries.matrix.ui.model.InviteSender
 import kotlinx.collections.immutable.toImmutableList
 
-open class RoomListRoomSummaryProvider : PreviewParameterProvider<RoomListRoomSummary> {
+open class RoomListRoomSummaryPreviewParam : PreviewParameterProvider<RoomListRoomSummary> {
     override val values: Sequence<RoomListRoomSummary>
         get() = sequenceOf(
             listOf(

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListContentStatePreviewParam.kt

@@ -19,7 +19,7 @@ import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableSet
 
-open class RoomListContentStateProvider : PreviewParameterProvider<RoomListContentState> {
+open class RoomListContentStatePreviewParam : PreviewParameterProvider<RoomListContentState> {
     override val values: Sequence<RoomListContentState>
         get() = sequenceOf(
             aRoomsContentState(),

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListContextMenu.kt

@@ -199,7 +199,7 @@ private fun RoomListModalBottomSheetContent(
 @PreviewsDayNight
 @Composable
 internal fun RoomListContextMenuPreview(
-    @PreviewParameter(RoomListStateContextMenuShownProvider::class) contextMenu: RoomListState.ContextMenu.Shown
+    @PreviewParameter(RoomListStateContextMenuShownPreviewParam::class) contextMenu: RoomListState.ContextMenu.Shown
 ) = ElementPreview(fillMaxSize = true) {
     RoomListContextMenu(
         contextMenu = contextMenu,

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListDeclineInviteMenu.kt

@@ -126,7 +126,7 @@ private fun RoomListDeclineInviteMenuContent(
 @PreviewsDayNight
 @Composable
 internal fun RoomListDeclineInviteMenuPreview(
-    @PreviewParameter(RoomListStateDeclineInviteMenuShownProvider::class) menu: RoomListState.DeclineInviteMenu.Shown,
+    @PreviewParameter(RoomListStateDeclineInviteMenuShownPreviewParam::class) menu: RoomListState.DeclineInviteMenu.Shown,
 ) = ElementPreview {
     RoomListDeclineInviteMenu(
         menu = menu,

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

@@ -30,14 +30,15 @@ import io.element.android.features.announcement.api.AnnouncementService
 import io.element.android.features.home.impl.datasource.RoomListDataSource
 import io.element.android.features.home.impl.filters.RoomListFiltersState
 import io.element.android.features.home.impl.filters.into
+import io.element.android.features.home.impl.search.GlobalSearchState
 import io.element.android.features.home.impl.search.RoomListSearchEvent
 import io.element.android.features.home.impl.search.RoomListSearchState
 import io.element.android.features.home.impl.spacefilters.SpaceFiltersState
 import io.element.android.features.home.impl.spacefilters.into
 import io.element.android.features.home.impl.spacefilters.selectedFilter
 import io.element.android.features.invite.api.SeenInvitesStore
-import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteEvents.AcceptInvite
-import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteEvents.DeclineInvite
+import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteEvent.AcceptInvite
+import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteEvent.DeclineInvite
 import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteState
 import io.element.android.features.leaveroom.api.LeaveRoomEvent
 import io.element.android.features.leaveroom.api.LeaveRoomState
@@ -85,6 +86,7 @@ class RoomListPresenter(
     private val announcementService: AnnouncementService,
     private val coldStartWatcher: AnalyticsColdStartWatcher,
     private val spaceFiltersPresenter: Presenter<SpaceFiltersState>,
+    private val globalSearchPresenter: Presenter<GlobalSearchState>,
     private val featureFlagService: FeatureFlagService,
 ) : Presenter<RoomListState> {
     private val encryptionService = client.encryptionService
@@ -97,6 +99,7 @@ class RoomListPresenter(
         val searchState = searchPresenter.present()
         val spaceFiltersState = spaceFiltersPresenter.present()
         val acceptDeclineInviteState = acceptDeclineInvitePresenter.present()
+        val globalSearchState = globalSearchPresenter.present()
 
         LaunchedEffect(Unit) {
             roomListDataSource.launchIn(this)
@@ -177,6 +180,7 @@ class RoomListPresenter(
             leaveRoomState = leaveRoomState,
             filtersState = filtersState,
             searchState = searchState,
+            globalSearchState = globalSearchState,
             spaceFiltersState = spaceFiltersState,
             contentState = contentState,
             acceptDeclineInviteState = acceptDeclineInviteState,

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListState.kt

@@ -11,6 +11,7 @@ package io.element.android.features.home.impl.roomlist
 import androidx.compose.runtime.Immutable
 import io.element.android.features.home.impl.filters.RoomListFiltersState
 import io.element.android.features.home.impl.model.RoomListRoomSummary
+import io.element.android.features.home.impl.search.GlobalSearchState
 import io.element.android.features.home.impl.search.RoomListSearchState
 import io.element.android.features.home.impl.spacefilters.SpaceFiltersState
 import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteState
@@ -27,6 +28,7 @@ data class RoomListState(
     val leaveRoomState: LeaveRoomState,
     val filtersState: RoomListFiltersState,
     val searchState: RoomListSearchState,
+    val globalSearchState: GlobalSearchState,
     val spaceFiltersState: SpaceFiltersState,
     val contentState: RoomListContentState,
     val acceptDeclineInviteState: AcceptDeclineInviteState,

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListStateContextMenuShownPreviewParam.kt

@@ -11,7 +11,7 @@ package io.element.android.features.home.impl.roomlist
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.libraries.matrix.api.core.RoomId
 
-open class RoomListStateContextMenuShownProvider : PreviewParameterProvider<RoomListState.ContextMenu.Shown> {
+open class RoomListStateContextMenuShownPreviewParam : PreviewParameterProvider<RoomListState.ContextMenu.Shown> {
     override val values: Sequence<RoomListState.ContextMenu.Shown>
         get() = sequenceOf(
             aContextMenuShown(hasNewContent = true),

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListStateDeclineInviteMenuShownPreviewParam.kt

@@ -12,7 +12,7 @@ import androidx.compose.ui.tooling.preview.datasource.LoremIpsum
 import io.element.android.features.home.impl.model.RoomListRoomSummary
 import io.element.android.features.home.impl.model.aRoomListRoomSummary
 
-open class RoomListStateDeclineInviteMenuShownProvider : PreviewParameterProvider<RoomListState.DeclineInviteMenu.Shown> {
+open class RoomListStateDeclineInviteMenuShownPreviewParam : PreviewParameterProvider<RoomListState.DeclineInviteMenu.Shown> {
     override val values: Sequence<RoomListState.DeclineInviteMenu.Shown>
         get() = sequenceOf(
             aDeclineInviteMenuShown(),

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListStatePreviewParam.kt

@@ -16,7 +16,9 @@ import io.element.android.features.home.impl.model.RoomListRoomSummary
 import io.element.android.features.home.impl.model.RoomSummaryDisplayType
 import io.element.android.features.home.impl.model.aRoomListRoomSummary
 import io.element.android.features.home.impl.model.anInviteSender
+import io.element.android.features.home.impl.search.GlobalSearchState
 import io.element.android.features.home.impl.search.RoomListSearchState
+import io.element.android.features.home.impl.search.aGlobalSearchState
 import io.element.android.features.home.impl.search.aRoomListSearchState
 import io.element.android.features.home.impl.spacefilters.SpaceFiltersState
 import io.element.android.features.home.impl.spacefilters.anUnselectedSpaceFiltersState
@@ -31,7 +33,7 @@ import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
 
-open class RoomListStateProvider : PreviewParameterProvider<RoomListState> {
+open class RoomListStatePreviewParam : PreviewParameterProvider<RoomListState> {
     override val values: Sequence<RoomListState>
         get() = sequenceOf(
             aRoomListState(),
@@ -41,7 +43,10 @@ open class RoomListStateProvider : PreviewParameterProvider<RoomListState> {
             aRoomListState(contentState = aRoomsContentState(securityBannerState = SecurityBannerState.RecoveryKeyConfirmation)),
             aRoomListState(contentState = anEmptyContentState()),
             aRoomListState(contentState = aSkeletonContentState()),
-            aRoomListState(searchState = aRoomListSearchState(isSearchActive = true, query = "Test")),
+            aRoomListState(
+                searchState = aRoomListSearchState(isSearchActive = true, query = "Test"),
+                globalSearchState = aGlobalSearchState(isEnabled = false),
+            ),
             aRoomListState(contentState = aRoomsContentState(securityBannerState = SecurityBannerState.SetUpRecovery)),
             aRoomListState(contentState = aRoomsContentState(batteryOptimizationState = aBatteryOptimizationState(shouldDisplayBanner = true))),
             aRoomListState(contentState = anEmptyContentState(securityBannerState = SecurityBannerState.RecoveryKeyConfirmation)),
@@ -53,6 +58,7 @@ internal fun aRoomListState(
     declineInviteMenu: RoomListState.DeclineInviteMenu = RoomListState.DeclineInviteMenu.Hidden,
     leaveRoomState: LeaveRoomState = aLeaveRoomState(),
     searchState: RoomListSearchState = aRoomListSearchState(),
+    globalSearchState: GlobalSearchState = aGlobalSearchState(),
     filtersState: RoomListFiltersState = aRoomListFiltersState(),
     spaceFiltersState: SpaceFiltersState = anUnselectedSpaceFiltersState(),
     contentState: RoomListContentState = aRoomsContentState(),
@@ -66,6 +72,7 @@ internal fun aRoomListState(
     leaveRoomState = leaveRoomState,
     filtersState = filtersState,
     searchState = searchState,
+    globalSearchState = globalSearchState,
     spaceFiltersState = spaceFiltersState,
     contentState = contentState,
     acceptDeclineInviteState = acceptDeclineInviteState,

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/GlobalSearchEvent.kt

@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.home.impl.search
+
+sealed interface GlobalSearchEvent {
+    object ClearQuery : GlobalSearchEvent
+    object ToggleSearchVisibility : GlobalSearchEvent
+    data class UpdateVisibleRange(val range: IntRange) : GlobalSearchEvent
+    data class UpdateTarget(val target: GlobalSearchTarget) : GlobalSearchEvent
+}

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/GlobalSearchPresenter.kt

@@ -0,0 +1,301 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.home.impl.search
+
+import androidx.compose.foundation.text.input.clearText
+import androidx.compose.foundation.text.input.rememberTextFieldState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.produceState
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import dev.zacsweers.metro.Inject
+import io.element.android.libraries.androidutils.filesize.FileSizeFormatter
+import io.element.android.libraries.architecture.AsyncData
+import io.element.android.libraries.architecture.Presenter
+import io.element.android.libraries.core.coroutine.CoroutineDispatchers
+import io.element.android.libraries.dateformatter.api.DateFormatter
+import io.element.android.libraries.dateformatter.api.DateFormatterMode
+import io.element.android.libraries.eventformatter.api.RoomLatestEventFormatter
+import io.element.android.libraries.featureflag.api.FeatureFlagService
+import io.element.android.libraries.featureflag.api.FeatureFlags
+import io.element.android.libraries.matrix.api.MatrixClient
+import io.element.android.libraries.matrix.api.permalink.PermalinkParser
+import io.element.android.libraries.matrix.api.room.RoomInfo
+import io.element.android.libraries.matrix.api.roomlist.LatestEventValue
+import io.element.android.libraries.matrix.api.search.MessageSearch
+import io.element.android.libraries.matrix.api.search.MessageSearchPaginationState
+import io.element.android.libraries.matrix.api.search.MessageSearchResult
+import io.element.android.libraries.matrix.api.search.MessageSearchService
+import io.element.android.libraries.matrix.api.timeline.item.event.AudioMessageType
+import io.element.android.libraries.matrix.api.timeline.item.event.FileMessageType
+import io.element.android.libraries.matrix.api.timeline.item.event.ImageMessageType
+import io.element.android.libraries.matrix.api.timeline.item.event.MessageContent
+import io.element.android.libraries.matrix.api.timeline.item.event.MessageTypeWithAttachment
+import io.element.android.libraries.matrix.api.timeline.item.event.StickerMessageType
+import io.element.android.libraries.matrix.api.timeline.item.event.VideoMessageType
+import io.element.android.libraries.matrix.api.timeline.item.event.VoiceMessageType
+import io.element.android.libraries.matrix.api.timeline.item.event.isMediaContent
+import io.element.android.libraries.matrix.ui.components.AttachmentThumbnailType
+import io.element.android.libraries.matrix.ui.messages.toPlainText
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.toImmutableList
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.launch
+import timber.log.Timber
+import kotlin.jvm.optionals.getOrElse
+import kotlin.time.Duration.Companion.milliseconds
+
+@Inject
+class GlobalSearchPresenter(
+    private val roomListSearchDataSourceFactory: RoomListSearchDataSource.Factory,
+    private val messageSearchService: MessageSearchService,
+    private val featureFlagService: FeatureFlagService,
+    private val latestEventFormatter: RoomLatestEventFormatter,
+    private val dateFormatter: DateFormatter,
+    private val fileSizeFormatter: FileSizeFormatter,
+    private val permalinkParser: PermalinkParser,
+    private val coroutineDispatchers: CoroutineDispatchers,
+    private val matrixClient: MatrixClient,
+) : Presenter<GlobalSearchState> {
+    @Composable
+    override fun present(): GlobalSearchState {
+        val coroutineScope = rememberCoroutineScope()
+        val isEnabled by produceState(false) {
+            featureFlagService.isFeatureEnabledFlow(FeatureFlags.MessageSearch).collectLatest { value = it }
+        }
+        val roomListSearchDataSource = remember { roomListSearchDataSourceFactory.create(coroutineScope = coroutineScope) }
+        val queryState = rememberTextFieldState()
+        var isSearchActive by remember { mutableStateOf(false) }
+        var searchResults: AsyncData<GlobalSearchResults> by remember { mutableStateOf(AsyncData.Uninitialized) }
+        var currentTarget: GlobalSearchTarget by remember { mutableStateOf(GlobalSearchTarget.ROOMS) }
+        val currentMessageSearch: MessageSearch = remember { messageSearchService.createMessageSearch(scope = coroutineScope) }
+
+        LaunchedEffect(queryState.text) {
+            // Add a delay to avoid performing too many searches in a short period of time, which can be expensive
+            delay(200.milliseconds)
+
+            searchResults = if (queryState.text.isNotEmpty()) {
+                AsyncData.Loading(prevData = searchResults.dataOrNull())
+            } else {
+                AsyncData.Uninitialized
+            }
+
+            launch { roomListSearchDataSource.setSearchQuery(queryState.text.toString()) }
+            launch {
+                currentMessageSearch.setQuery(queryState.text.toString())
+                    .onFailure { Timber.e(it, "Could not set query for message search") }
+            }
+        }
+
+        LaunchedEffect(currentTarget) {
+            if (queryState.text.isNotEmpty()) {
+                searchResults = AsyncData.Loading()
+            }
+
+            when (currentTarget) {
+                GlobalSearchTarget.ROOMS -> {
+                    roomListSearchDataSource.roomSummaries.collectLatest { results ->
+                        Timber.d("Room list search found ${results.size} items")
+                        // The room list data source always returns some values, even if the query is empty,
+                        // so we only want to update the search results if the query is not empty
+                        searchResults = if (queryState.text.isNotEmpty()) {
+                            AsyncData.Success(GlobalSearchResults.RoomListResults(results = results))
+                        } else {
+                            AsyncData.Uninitialized
+                        }
+                    }
+                }
+                GlobalSearchTarget.MESSAGES -> {
+                    Timber.d("Message search found ${currentMessageSearch.results.value.size} items")
+                    combine(
+                        currentMessageSearch.results,
+                        currentMessageSearch.paginationState,
+                    ) { results, paginationState ->
+                        Pair(results, paginationState)
+                    }.collectLatest { (results, paginationState) ->
+                        Timber.d("Message search found ${results.size} items, pagination state: $paginationState")
+
+                        // Try processing the results in parallel to speed up the processing time, since we have to wait until we get the room info for each
+                        // result, which can be slow if we have a lot of results. The original order is kept by using `awaitAll()`.
+                        val mappedResults = results.map { result ->
+                            async(coroutineDispatchers.computation) {
+                                val roomInfo = matrixClient.getRoomInfoFlow(result.roomId).first().getOrElse { return@async null }
+                                val formattedTimestamp = dateFormatter.format(
+                                    timestamp = result.timestamp,
+                                    mode = DateFormatterMode.TimeOrDate,
+                                    useRelative = true
+                                )
+
+                                if (!result.content.isMediaContent()) {
+                                    mapMessageContent(result, roomInfo, formattedTimestamp)
+                                } else {
+                                    mapMediaContent(result, roomInfo, formattedTimestamp)
+                                }
+                            }
+                        }
+                            .awaitAll()
+                            .mapNotNull { it }
+
+                        searchResults = when {
+                            queryState.text.isEmpty() -> AsyncData.Uninitialized
+                            mappedResults.isNotEmpty() -> {
+                                AsyncData.Success(GlobalSearchResults.MessageSearchResults(results = mappedResults.toImmutableList()))
+                            }
+                            paginationState is MessageSearchPaginationState.Idle && paginationState.endReached -> {
+                                AsyncData.Success(GlobalSearchResults.MessageSearchResults(results = persistentListOf()))
+                            }
+                            paginationState is MessageSearchPaginationState.Loading -> {
+                                AsyncData.Loading(prevData = searchResults.dataOrNull())
+                            }
+                            else -> {
+                                AsyncData.Uninitialized
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        fun handleEvent(event: GlobalSearchEvent) {
+            when (event) {
+                GlobalSearchEvent.ClearQuery -> {
+                    queryState.clearText()
+                }
+                GlobalSearchEvent.ToggleSearchVisibility -> {
+                    isSearchActive = !isSearchActive
+                    queryState.clearText()
+                }
+                is GlobalSearchEvent.UpdateVisibleRange -> {
+                    when (currentTarget) {
+                        GlobalSearchTarget.ROOMS -> coroutineScope.launch {
+                            // TODO Maybe this is not needed? We're not displaying the latest event or timestamp info so maybe we dont need to subscribe
+                            //  to the room info for each room in the search results.
+                            roomListSearchDataSource.updateVisibleRange(event.range)
+                        }
+                        GlobalSearchTarget.MESSAGES -> coroutineScope.launch {
+                            val currentCount = (searchResults.dataOrNull() as? GlobalSearchResults.MessageSearchResults)?.results?.size ?: 0
+                            val currentPaginationState = currentMessageSearch.paginationState.value
+                            val canPaginate = currentPaginationState is MessageSearchPaginationState.Idle && !currentPaginationState.endReached
+                            if (event.range.last >= currentCount - 10 && canPaginate) {
+                                currentMessageSearch.paginate()
+                            }
+                        }
+                    }
+                }
+                is GlobalSearchEvent.UpdateTarget -> currentTarget = event.target
+            }
+        }
+
+        return GlobalSearchState(
+            isEnabled = isEnabled,
+            isSearchActive = isSearchActive,
+            queryState = queryState,
+            currentTarget = currentTarget,
+            results = searchResults,
+            eventSink = ::handleEvent,
+        )
+    }
+
+    private fun mapMessageContent(
+        result: MessageSearchResult,
+        roomInfo: RoomInfo,
+        formattedTimestamp: String,
+    ): MessageSearchResultItem.Message? {
+        val body = latestEventFormatter.format(
+            latestEvent = LatestEventValue.Remote(
+                timestamp = result.timestamp,
+                content = result.content,
+                senderId = result.senderId,
+                senderProfile = result.senderProfile,
+                isOwn = matrixClient.isMe(result.senderId),
+            ),
+            isDmRoom = false,
+        )
+        return MessageSearchResultItem.Message(
+            messageSearchResult = result,
+            body = body?.toString() ?: "",
+            formattedTimestamp = formattedTimestamp,
+            roomInfo = roomInfo,
+        )
+    }
+
+    private fun mapMediaContent(
+        result: MessageSearchResult,
+        roomInfo: RoomInfo,
+        formattedTimestamp: String,
+    ): MessageSearchResultItem.Media? {
+        val messageType = when (val content = result.content) {
+            is MessageContent if content.type is MessageTypeWithAttachment -> content.type as MessageTypeWithAttachment
+            else -> return null
+        }
+
+        val caption = messageType.toPlainText(permalinkParser, default = messageType.caption ?: messageType.filename)
+
+        val thumbnailType = when (messageType) {
+            is ImageMessageType -> AttachmentThumbnailType.Image
+            is VideoMessageType -> AttachmentThumbnailType.Video
+            is AudioMessageType -> AttachmentThumbnailType.Audio
+            is VoiceMessageType -> AttachmentThumbnailType.Voice
+            is FileMessageType -> AttachmentThumbnailType.File
+            is StickerMessageType -> AttachmentThumbnailType.Image
+        }
+        val thumbnailSource = when (messageType) {
+            is ImageMessageType -> messageType.info?.thumbnailSource ?: messageType.source
+            is VideoMessageType -> messageType.info?.thumbnailSource
+            is AudioMessageType -> null
+            is VoiceMessageType -> null
+            is FileMessageType -> null
+            is StickerMessageType -> messageType.info?.thumbnailSource ?: messageType.source
+        }
+        val blurhash = when (messageType) {
+            is ImageMessageType -> messageType.info?.blurhash
+            is VideoMessageType -> messageType.info?.blurhash
+            is AudioMessageType -> null
+            is VoiceMessageType -> null
+            is FileMessageType -> null
+            is StickerMessageType -> messageType.info?.blurhash
+        }
+
+        val extension = messageType.filename.split(".").takeIf { it.size > 1 }?.lastOrNull()?.uppercase()
+        val formattedSize = when (messageType) {
+            is ImageMessageType -> messageType.info?.size
+            is VideoMessageType -> messageType.info?.size
+            is AudioMessageType -> messageType.info?.size
+            is VoiceMessageType -> messageType.info?.size
+            is FileMessageType -> messageType.info?.size
+            is StickerMessageType -> messageType.info?.size
+        }
+            ?.let(fileSizeFormatter::format)
+
+        val mediaContent = MediaSearchResultContent(
+            filename = messageType.filename,
+            extension = extension,
+            caption = caption,
+            formattedSize = formattedSize,
+            thumbnailSource = thumbnailSource,
+            thumbnailType = thumbnailType,
+            blurhash = blurhash
+        )
+
+        return MessageSearchResultItem.Media(
+            messageSearchResult = result,
+            mediaContent = mediaContent,
+            formattedTimestamp = formattedTimestamp,
+            roomInfo = roomInfo,
+        )
+    }
+}

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/GlobalSearchState.kt

@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.home.impl.search
+
+import androidx.compose.foundation.text.input.TextFieldState
+import androidx.compose.runtime.Immutable
+import io.element.android.features.home.impl.model.RoomListRoomSummary
+import io.element.android.libraries.architecture.AsyncData
+import io.element.android.libraries.matrix.api.core.EventId
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.api.media.MediaSource
+import io.element.android.libraries.matrix.api.room.RoomInfo
+import io.element.android.libraries.matrix.api.search.MessageSearchResult
+import io.element.android.libraries.matrix.api.timeline.item.event.getDisambiguatedDisplayName
+import io.element.android.libraries.matrix.ui.components.AttachmentThumbnailType
+import kotlinx.collections.immutable.ImmutableList
+
+@Immutable
+data class GlobalSearchState(
+    val isEnabled: Boolean,
+    val isSearchActive: Boolean,
+    val queryState: TextFieldState,
+    val currentTarget: GlobalSearchTarget,
+    val results: AsyncData<GlobalSearchResults>,
+    val eventSink: (GlobalSearchEvent) -> Unit
+)
+
+@Immutable
+enum class GlobalSearchTarget {
+    ROOMS,
+    MESSAGES,
+}
+
+@Immutable
+sealed interface GlobalSearchResults {
+    data class RoomListResults(val results: ImmutableList<RoomListRoomSummary>) : GlobalSearchResults
+    data class MessageSearchResults(val results: ImmutableList<MessageSearchResultItem>) : GlobalSearchResults
+
+    fun isEmpty(): Boolean = when (this) {
+        is RoomListResults -> results.isEmpty()
+        is MessageSearchResults -> results.isEmpty()
+    }
+}
+
+sealed interface MessageSearchResultItem {
+    val roomId: RoomId
+    val eventId: EventId
+    val senderId: UserId
+    val senderName: String
+    val roomInfo: RoomInfo
+    val formattedTimestamp: String
+
+    data class Message(
+        val messageSearchResult: MessageSearchResult,
+        val body: String,
+        override val roomInfo: RoomInfo,
+        override val formattedTimestamp: String,
+    ) : MessageSearchResultItem {
+        override val roomId: RoomId = messageSearchResult.roomId
+        override val eventId: EventId = messageSearchResult.eventId
+        override val senderId: UserId = messageSearchResult.senderId
+        override val senderName: String = messageSearchResult.senderProfile.getDisambiguatedDisplayName(senderId)
+    }
+
+    data class Media(
+        val messageSearchResult: MessageSearchResult,
+        val mediaContent: MediaSearchResultContent,
+        override val roomInfo: RoomInfo,
+        override val formattedTimestamp: String,
+    ) : MessageSearchResultItem {
+        override val roomId: RoomId = messageSearchResult.roomId
+        override val eventId: EventId = messageSearchResult.eventId
+        override val senderId: UserId = messageSearchResult.senderId
+        override val senderName: String = messageSearchResult.senderProfile.getDisambiguatedDisplayName(senderId)
+    }
+}
+
+data class MediaSearchResultContent(
+    val filename: String,
+    val extension: String?,
+    val caption: String?,
+    val formattedSize: String?,
+    val thumbnailSource: MediaSource?,
+    val thumbnailType: AttachmentThumbnailType,
+    val blurhash: String?,
+)

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/GlobalSearchStatePreviewParam.kt

@@ -0,0 +1,249 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.home.impl.search
+
+import androidx.compose.foundation.text.input.TextFieldState
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import io.element.android.features.home.impl.roomlist.aRoomListRoomSummaryList
+import io.element.android.libraries.architecture.AsyncData
+import io.element.android.libraries.matrix.api.core.EventId
+import io.element.android.libraries.matrix.api.core.RoomAlias
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.api.media.MediaSource
+import io.element.android.libraries.matrix.api.room.CallIntentConsensus
+import io.element.android.libraries.matrix.api.room.CurrentUserMembership
+import io.element.android.libraries.matrix.api.room.RoomInfo
+import io.element.android.libraries.matrix.api.room.RoomMember
+import io.element.android.libraries.matrix.api.room.RoomNotificationMode
+import io.element.android.libraries.matrix.api.room.history.RoomHistoryVisibility
+import io.element.android.libraries.matrix.api.room.join.JoinRule
+import io.element.android.libraries.matrix.api.room.powerlevels.RoomPowerLevels
+import io.element.android.libraries.matrix.api.room.powerlevels.RoomPowerLevelsValues
+import io.element.android.libraries.matrix.api.room.tombstone.SuccessorRoom
+import io.element.android.libraries.matrix.api.search.MessageSearchResult
+import io.element.android.libraries.matrix.api.timeline.item.EventThreadInfo
+import io.element.android.libraries.matrix.api.timeline.item.event.InReplyTo
+import io.element.android.libraries.matrix.api.timeline.item.event.MessageContent
+import io.element.android.libraries.matrix.api.timeline.item.event.MessageType
+import io.element.android.libraries.matrix.api.timeline.item.event.ProfileDetails
+import io.element.android.libraries.matrix.api.timeline.item.event.TextMessageType
+import io.element.android.libraries.matrix.api.user.MatrixUser
+import io.element.android.libraries.matrix.ui.components.AttachmentThumbnailType
+import io.element.android.libraries.matrix.ui.messages.reply.aProfileDetailsReady
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.persistentMapOf
+import kotlinx.collections.immutable.toImmutableList
+import kotlinx.collections.immutable.toPersistentList
+
+class GlobalSearchStatePreviewParam : PreviewParameterProvider<GlobalSearchState> {
+    override val values: Sequence<GlobalSearchState>
+        get() = sequenceOf(
+            // Not enabled, no preview
+            aGlobalSearchState(isEnabled = false),
+            aGlobalSearchState(isSearchActive = true, queryState = TextFieldState("Query")),
+            aGlobalSearchState(
+                isSearchActive = true,
+                currentTarget = GlobalSearchTarget.ROOMS,
+                queryState = TextFieldState("Query"),
+                results = AsyncData.Loading(),
+            ),
+            aGlobalSearchState(
+                isSearchActive = true,
+                currentTarget = GlobalSearchTarget.ROOMS,
+                queryState = TextFieldState("Query"),
+                results = AsyncData.Success(
+                    GlobalSearchResults.RoomListResults(
+                        results = aRoomListRoomSummaryList().mapIndexed { index, summary ->
+                            summary.copy(name = "Room with Query #${index + 1}")
+                        }.toPersistentList()
+                    )
+                ),
+            ),
+            aGlobalSearchState(
+                isSearchActive = true,
+                currentTarget = GlobalSearchTarget.MESSAGES,
+                queryState = TextFieldState("Query"),
+                results = AsyncData.Success(GlobalSearchResults.MessageSearchResults(persistentListOf(
+                    MessageSearchResultItem.Message(
+                        messageSearchResult = aMessageSearchResult(eventId = EventId("\$eventId1:server.org")),
+                        body = "A message with Query",
+                        roomInfo = aRoomInfo(),
+                        formattedTimestamp = "12:00",
+                    ),
+                    MessageSearchResultItem.Media(
+                        messageSearchResult = aMessageSearchResult(eventId = EventId("\$eventId2:server.org")),
+                        mediaContent = MediaSearchResultContent(
+                            filename = "file.png",
+                            extension = "PNG",
+                            caption = "A caption containing Query",
+                            formattedSize = "1 MB",
+                            thumbnailSource = MediaSource("https://example.com/thumbnail.png"),
+                            thumbnailType = AttachmentThumbnailType.Image,
+                            blurhash = null,
+                        ),
+                        roomInfo = aRoomInfo(),
+                        formattedTimestamp = "12:00",
+                    ),
+                ))),
+            ),
+            aGlobalSearchState(
+                isSearchActive = true,
+                currentTarget = GlobalSearchTarget.MESSAGES,
+                queryState = TextFieldState("Query"),
+                results = AsyncData.Success(GlobalSearchResults.MessageSearchResults(persistentListOf())),
+            ),
+        )
+}
+
+fun aRoomInfo(
+    id: RoomId = RoomId("!roomId:server.org"),
+    name: String? = "A room",
+    rawName: String? = "A room raw name",
+    topic: String? = "A room topic",
+    avatarUrl: String? = "https://example.com/avatar.png",
+    isPublic: Boolean = true,
+    isDirect: Boolean = false,
+    isEncrypted: Boolean = false,
+    joinRule: JoinRule? = JoinRule.Public,
+    isSpace: Boolean = false,
+    successorRoom: SuccessorRoom? = null,
+    isFavorite: Boolean = false,
+    canonicalAlias: RoomAlias? = null,
+    alternativeAliases: List<RoomAlias> = emptyList(),
+    currentUserMembership: CurrentUserMembership = CurrentUserMembership.JOINED,
+    inviter: RoomMember? = null,
+    activeMembersCount: Long = 2,
+    invitedMembersCount: Long = 1,
+    joinedMembersCount: Long = 1,
+    highlightCount: Long = 0,
+    notificationCount: Long = 0,
+    userDefinedNotificationMode: RoomNotificationMode? = null,
+    hasRoomCall: Boolean = false,
+    roomPowerLevels: RoomPowerLevels? = RoomPowerLevels(
+        values = RoomPowerLevelsValues(
+            ban = 0,
+            invite = 0,
+            kick = 0,
+            eventsDefault = 0,
+            stateDefault = 0,
+            redactEvents = 0,
+            roomName = 0,
+            roomAvatar = 0,
+            roomTopic = 0,
+            spaceChild = 0,
+            beacon = 0,
+            beaconInfo = 0
+        ),
+        users = persistentMapOf(),
+    ),
+    activeRoomCallParticipants: List<UserId> = emptyList(),
+    heroes: List<MatrixUser> = emptyList(),
+    pinnedEventIds: List<EventId> = emptyList(),
+    roomCreators: List<UserId> = emptyList(),
+    isMarkedUnread: Boolean = false,
+    numUnreadMessages: Long = 0,
+    numUnreadNotifications: Long = 0,
+    numUnreadMentions: Long = 0,
+    historyVisibility: RoomHistoryVisibility = RoomHistoryVisibility.Joined,
+    roomVersion: String? = "11",
+    privilegedCreatorRole: Boolean = false,
+    isLowPriority: Boolean = false,
+    activeCallIntentConsensus: CallIntentConsensus = CallIntentConsensus.None,
+    isDm: Boolean = false,
+    fullyReadEventId: EventId? = null,
+) = RoomInfo(
+    id = id,
+    name = name,
+    rawName = rawName,
+    topic = topic,
+    avatarUrl = avatarUrl,
+    isPublic = isPublic,
+    isDirect = isDirect,
+    isEncrypted = isEncrypted,
+    joinRule = joinRule,
+    isSpace = isSpace,
+    successorRoom = successorRoom,
+    isFavorite = isFavorite,
+    canonicalAlias = canonicalAlias,
+    alternativeAliases = alternativeAliases.toImmutableList(),
+    currentUserMembership = currentUserMembership,
+    inviter = inviter,
+    activeMembersCount = activeMembersCount,
+    invitedMembersCount = invitedMembersCount,
+    joinedMembersCount = joinedMembersCount,
+    highlightCount = highlightCount,
+    notificationCount = notificationCount,
+    userDefinedNotificationMode = userDefinedNotificationMode,
+    hasRoomCall = hasRoomCall,
+    roomPowerLevels = roomPowerLevels,
+    activeRoomCallParticipants = activeRoomCallParticipants.toImmutableList(),
+    heroes = heroes.toImmutableList(),
+    pinnedEventIds = pinnedEventIds.toImmutableList(),
+    creators = roomCreators.toImmutableList(),
+    isMarkedUnread = isMarkedUnread,
+    numUnreadMessages = numUnreadMessages,
+    numUnreadNotifications = numUnreadNotifications,
+    numUnreadMentions = numUnreadMentions,
+    historyVisibility = historyVisibility,
+    roomVersion = roomVersion,
+    privilegedCreatorRole = privilegedCreatorRole,
+    isLowPriority = isLowPriority,
+    activeCallIntentConsensus = activeCallIntentConsensus,
+    isDm = isDm,
+    fullyReadEventId = fullyReadEventId,
+)
+
+fun aMessageContent(
+    body: String = "body",
+    inReplyTo: InReplyTo? = null,
+    isEdited: Boolean = false,
+    threadInfo: EventThreadInfo? = null,
+    messageType: MessageType = TextMessageType(
+        body = body,
+        formatted = null
+    )
+) = MessageContent(
+    body = body,
+    inReplyTo = inReplyTo,
+    isEdited = isEdited,
+    threadInfo = threadInfo,
+    type = messageType
+)
+
+internal fun aMessageSearchResult(
+    roomId: RoomId = RoomId("!roomId:server.org"),
+    eventId: EventId = EventId("\$eventId:server.org"),
+    senderId: UserId = UserId("@user:server.org"),
+    senderProfile: ProfileDetails = aProfileDetailsReady(),
+    content: MessageContent = aMessageContent(),
+    timestamp: Long = 0L,
+) = MessageSearchResult(
+    roomId = roomId,
+    eventId = eventId,
+    senderId = senderId,
+    senderProfile = senderProfile,
+    content = content,
+    timestamp = timestamp,
+)
+
+internal fun aGlobalSearchState(
+    isEnabled: Boolean = true,
+    isSearchActive: Boolean = false,
+    queryState: TextFieldState = TextFieldState(),
+    currentTarget: GlobalSearchTarget = GlobalSearchTarget.ROOMS,
+    results: AsyncData<GlobalSearchResults> = AsyncData.Uninitialized,
+    eventSink: (GlobalSearchEvent) -> Unit = {},
+) = GlobalSearchState(
+    isEnabled = isEnabled,
+    isSearchActive = isSearchActive,
+    queryState = queryState,
+    currentTarget = currentTarget,
+    results = results,
+    eventSink = eventSink
+)

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/GlobalSearchView.kt

@@ -0,0 +1,564 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.home.impl.search
+
+import androidx.activity.compose.BackHandler
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyListScope
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.input.TextFieldLineLimits
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.SingleChoiceSegmentedButtonRow
+import androidx.compose.material3.TextFieldDefaults
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.drawBehind
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.contentDescription
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.unit.dp
+import io.element.android.compound.theme.ElementTheme
+import io.element.android.compound.tokens.generated.CompoundIcons
+import io.element.android.features.home.impl.R
+import io.element.android.features.home.impl.model.RoomListRoomSummary
+import io.element.android.libraries.designsystem.atomic.molecules.IconTitleSubtitleMolecule
+import io.element.android.libraries.designsystem.components.BigIcon
+import io.element.android.libraries.designsystem.components.avatar.Avatar
+import io.element.android.libraries.designsystem.components.avatar.AvatarData
+import io.element.android.libraries.designsystem.components.avatar.AvatarSize
+import io.element.android.libraries.designsystem.components.avatar.AvatarType
+import io.element.android.libraries.designsystem.components.button.BackButton
+import io.element.android.libraries.designsystem.modifiers.niceClickable
+import io.element.android.libraries.designsystem.preview.ElementPreview
+import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.text.roundToPx
+import io.element.android.libraries.designsystem.theme.components.FilledTextField
+import io.element.android.libraries.designsystem.theme.components.Icon
+import io.element.android.libraries.designsystem.theme.components.IconButton
+import io.element.android.libraries.designsystem.theme.components.LinearProgressIndicator
+import io.element.android.libraries.designsystem.theme.components.Scaffold
+import io.element.android.libraries.designsystem.theme.components.SegmentedButton
+import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.designsystem.theme.components.TopAppBar
+import io.element.android.libraries.designsystem.utils.OnVisibleRangeChangeEffect
+import io.element.android.libraries.designsystem.utils.lazyColumnContentPadding
+import io.element.android.libraries.designsystem.utils.scaffoldScrollableContentInsets
+import io.element.android.libraries.matrix.api.core.EventId
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.ui.components.AttachmentThumbnail
+import io.element.android.libraries.matrix.ui.components.AttachmentThumbnailInfo
+import io.element.android.libraries.matrix.ui.model.getAvatarData
+import io.element.android.libraries.ui.strings.CommonStrings
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toImmutableList
+
+@Composable
+fun GlobalSearchView(
+    state: GlobalSearchState,
+    onSelectSearchResult: (RoomId, EventId?) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    BackHandler(enabled = state.isSearchActive) {
+        state.eventSink(GlobalSearchEvent.ToggleSearchVisibility)
+    }
+
+    AnimatedVisibility(
+        visible = state.isSearchActive,
+        enter = fadeIn(),
+        exit = fadeOut(),
+    ) {
+        Column(modifier = modifier) {
+            GlobalSearchContent(
+                state = state,
+                onBackButtonClick = {
+                    state.eventSink(GlobalSearchEvent.ToggleSearchVisibility)
+                },
+                onSelectSearchResult = onSelectSearchResult,
+            )
+        }
+    }
+}
+
+@Composable
+private fun GlobalSearchContent(
+    state: GlobalSearchState,
+    onBackButtonClick: () -> Unit,
+    onSelectSearchResult: (RoomId, EventId?) -> Unit,
+) {
+    val borderColor = MaterialTheme.colorScheme.tertiary
+    val strokeWidth = 1.dp
+
+    val drawBottomLineModifier = Modifier.drawBehind {
+        drawLine(
+            color = borderColor,
+            start = Offset(0f, size.height),
+            end = Offset(size.width, size.height),
+            strokeWidth = strokeWidth.value
+        )
+    }
+
+    Scaffold(
+        topBar = {
+            TopAppBar(
+                navigationIcon = { BackButton(onClick = onBackButtonClick) },
+                title = {
+                    // The stateSaver will keep the selection state when returning to this UI
+                    val focusRequester = remember { FocusRequester() }
+                    val searchLabel = stringResource(CommonStrings.action_search)
+                    FilledTextField(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .focusRequester(focusRequester)
+                            .semantics { contentDescription = searchLabel },
+                        state = state.queryState,
+                        lineLimits = TextFieldLineLimits.SingleLine,
+                        colors = TextFieldDefaults.colors(
+                            focusedContainerColor = Color.Transparent,
+                            unfocusedContainerColor = Color.Transparent,
+                            disabledContainerColor = Color.Transparent,
+                            focusedIndicatorColor = Color.Transparent,
+                            unfocusedIndicatorColor = Color.Transparent,
+                            disabledIndicatorColor = Color.Transparent,
+                            errorIndicatorColor = Color.Transparent,
+                        ),
+                        trailingIcon = if (state.queryState.text.isNotEmpty()) {
+                            @Composable {
+                                IconButton(onClick = { state.eventSink(GlobalSearchEvent.ClearQuery) }) {
+                                    Icon(
+                                        imageVector = CompoundIcons.Close(),
+                                        contentDescription = stringResource(CommonStrings.a11y_clear_search_field)
+                                    )
+                                }
+                            }
+                        } else {
+                            null
+                        },
+                    )
+
+                    LaunchedEffect(Unit) {
+                        if (!focusRequester.restoreFocusedChild()) {
+                            focusRequester.requestFocus()
+                        }
+                        focusRequester.saveFocusedChild()
+                    }
+                }
+            )
+        },
+        contentWindowInsets = scaffoldScrollableContentInsets,
+    ) { padding ->
+        Column(
+            modifier = Modifier.padding(padding),
+        ) {
+            SingleChoiceSegmentedButtonRow(
+                modifier = drawBottomLineModifier
+                    .fillMaxWidth()
+                    .padding(start = 16.dp, end = 16.dp, top = 8.dp, bottom = 8.dp)
+            ) {
+                SegmentedButton(
+                    index = 0,
+                    count = 2,
+                    selected = state.currentTarget == GlobalSearchTarget.ROOMS,
+                    onClick = { state.eventSink(GlobalSearchEvent.UpdateTarget(GlobalSearchTarget.ROOMS)) },
+                    text = stringResource(R.string.search_section_chats),
+                )
+
+                SegmentedButton(
+                    index = 1,
+                    count = 2,
+                    selected = state.currentTarget == GlobalSearchTarget.MESSAGES,
+                    onClick = { state.eventSink(GlobalSearchEvent.UpdateTarget(GlobalSearchTarget.MESSAGES)) },
+                    text = stringResource(R.string.search_section_messages),
+                )
+            }
+
+            val lazyListState = rememberLazyListState()
+            OnVisibleRangeChangeEffect(lazyListState) { visibleRange ->
+                state.eventSink(GlobalSearchEvent.UpdateVisibleRange(visibleRange))
+            }
+
+            LazyColumn(
+                modifier = Modifier.fillMaxSize(),
+                contentPadding = lazyColumnContentPadding,
+                state = lazyListState,
+            ) {
+                val results = state.results.dataOrNull()
+                when {
+                    state.results.isUninitialized() -> startSearching()
+                    state.results.isLoading() -> loading()
+                    results?.isEmpty() == true -> emptySearchResults(query = state.queryState.text.toString())
+                    results is GlobalSearchResults.RoomListResults -> roomListResults(
+                        results = results.results,
+                        onRoomClick = { roomId -> onSelectSearchResult(roomId, null) },
+                    )
+                    results is GlobalSearchResults.MessageSearchResults -> messageSearchResults(
+                        results = results.results,
+                        onSearchResultSelected = onSelectSearchResult,
+                    )
+                }
+            }
+        }
+    }
+}
+
+private fun LazyListScope.startSearching() {
+    item {
+        IconTitleSubtitleMolecule(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(40.dp),
+            title = stringResource(R.string.start_searching_title),
+            subTitle = stringResource(R.string.start_searching_subtitle),
+            iconStyle = BigIcon.Style.Default(CompoundIcons.Search()),
+        )
+    }
+}
+
+private fun LazyListScope.loading() {
+    item {
+        LinearProgressIndicator(modifier = Modifier.fillMaxWidth())
+    }
+}
+
+private fun LazyListScope.emptySearchResults(query: String) {
+    item {
+        IconTitleSubtitleMolecule(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(40.dp),
+            title = stringResource(R.string.search_no_results_title),
+            subTitle = stringResource(R.string.search_no_results_subtitle, query),
+            iconStyle = BigIcon.Style.Default(CompoundIcons.Search()),
+        )
+    }
+}
+
+private fun LazyListScope.roomListResults(
+    results: ImmutableList<RoomListRoomSummary>,
+    onRoomClick: (RoomId) -> Unit,
+) {
+    itemsIndexed(
+        items = results,
+        key = { _, roomSummary -> roomSummary.roomId },
+    ) { index, result ->
+        Row(
+            modifier = Modifier
+                .niceClickable(onClick = { onRoomClick(result.roomId) })
+                .fillMaxWidth()
+                .addSeparatorLine(color = ElementTheme.colors.separatorSecondary, isLastItem = index == results.lastIndex)
+                .padding(horizontal = 16.dp, vertical = 12.dp),
+            horizontalArrangement = Arrangement.spacedBy(12.dp),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Avatar(
+                avatarData = result.avatarData.copy(size = AvatarSize.SearchRoomListItem),
+                avatarType = AvatarType.Room(
+                    heroes = result.heroes.map { it.copy(size = AvatarSize.SearchRoomListItem) }.toImmutableList(),
+                    isTombstoned = result.isTombstoned,
+                ),
+            )
+
+            Column(
+                verticalArrangement = Arrangement.spacedBy(2.dp),
+            ) {
+                Text(
+                    text = result.name ?: result.roomId.value,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                    style = ElementTheme.typography.fontBodyLgRegular,
+                )
+
+                if (result.isDm) {
+                    val userId = result.heroes.firstOrNull()?.id
+                    userId?.let {
+                        Text(
+                            text = it,
+                            maxLines = 1,
+                            overflow = TextOverflow.Ellipsis,
+                            style = ElementTheme.typography.fontBodyMdRegular,
+                            color = ElementTheme.colors.textSecondary,
+                        )
+                    }
+                } else {
+                    result.canonicalAlias?.let {
+                        Text(
+                            text = it.value,
+                            maxLines = 1,
+                            overflow = TextOverflow.Ellipsis,
+                            style = ElementTheme.typography.fontBodyMdRegular,
+                            color = ElementTheme.colors.textSecondary,
+                        )
+                    }
+                }
+            }
+        }
+    }
+}
+
+private fun LazyListScope.messageSearchResults(
+    results: ImmutableList<MessageSearchResultItem>,
+    onSearchResultSelected: (RoomId, EventId?) -> Unit,
+) {
+    if (results.isNotEmpty()) {
+        item {
+            Text(
+                modifier = Modifier.padding(horizontal = 16.dp, vertical = 12.dp),
+                text = stringResource(R.string.search_from_your_messages_header),
+                style = ElementTheme.typography.fontBodyMdMedium,
+                color = ElementTheme.colors.textSecondary,
+            )
+        }
+    }
+    itemsIndexed(
+        items = results,
+        contentType = { _, messageSearchResult -> messageSearchResult::class.java },
+        key = { _, messageSearchResult -> messageSearchResult.eventId },
+    ) { index, result ->
+        val clickableModifier = Modifier.niceClickable(onClick = { onSearchResultSelected(result.roomId, result.eventId) })
+        when (result) {
+            is MessageSearchResultItem.Message -> TextMessageSearchResultItemView(
+                modifier = clickableModifier.addSeparatorLine(color = ElementTheme.colors.separatorSecondary, isLastItem = index == results.lastIndex),
+                avatarData = result.roomInfo.getAvatarData(AvatarSize.RoomListItem),
+                avatarType = AvatarType.Room(
+                    heroes = result.roomInfo.heroes.map { it.getAvatarData(AvatarSize.RoomListItem) }.toImmutableList(),
+                    isTombstoned = result.roomInfo.successorRoom != null
+                ),
+                roomName = result.roomInfo.name ?: result.roomInfo.id.value,
+                body = result.body,
+                formattedTimestamp = result.formattedTimestamp,
+            )
+            is MessageSearchResultItem.Media -> {
+                MediaMessageSearchResultItemView(
+                    modifier = clickableModifier.addSeparatorLine(color = ElementTheme.colors.separatorSecondary, isLastItem = index == results.lastIndex),
+                    avatarData = result.roomInfo.getAvatarData(AvatarSize.RoomListItem),
+                    avatarType = AvatarType.Room(
+                        heroes = result.roomInfo.heroes.map { it.getAvatarData(AvatarSize.RoomListItem) }.toImmutableList(),
+                        isTombstoned = result.roomInfo.successorRoom != null
+                    ),
+                    roomName = result.roomInfo.name ?: result.roomInfo.id.value,
+                    content = result.mediaContent,
+                    formattedTimestamp = result.formattedTimestamp,
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun TextMessageSearchResultItemView(
+    avatarData: AvatarData,
+    avatarType: AvatarType,
+    roomName: String,
+    body: String,
+    formattedTimestamp: String,
+    modifier: Modifier = Modifier,
+) {
+    Row(
+        modifier = modifier
+            .fillMaxWidth()
+            .padding(horizontal = 16.dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Avatar(
+            avatarData = avatarData,
+            avatarType = avatarType,
+        )
+
+        Spacer(modifier = Modifier.width(16.dp))
+
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(top = 12.dp, bottom = 10.dp),
+            verticalArrangement = Arrangement.spacedBy(2.dp),
+        ) {
+            Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) {
+                Text(
+                    modifier = Modifier.weight(1f),
+                    text = roomName,
+                    maxLines = 1,
+                    style = ElementTheme.typography.fontBodyLgMedium,
+                )
+                Text(
+                    text = formattedTimestamp,
+                    maxLines = 1,
+                    style = ElementTheme.typography.fontBodySmRegular,
+                    color = ElementTheme.colors.textSecondary,
+                )
+            }
+            Text(
+                text = body,
+                maxLines = 2,
+                overflow = TextOverflow.Ellipsis,
+                style = ElementTheme.typography.fontBodyMdRegular,
+                color = ElementTheme.colors.textSecondary,
+            )
+        }
+    }
+}
+
+@Composable
+private fun MediaMessageSearchResultItemView(
+    avatarData: AvatarData,
+    avatarType: AvatarType,
+    roomName: String,
+    content: MediaSearchResultContent,
+    formattedTimestamp: String,
+    modifier: Modifier = Modifier,
+) {
+    Row(
+        modifier = modifier
+            .fillMaxWidth()
+            .padding(horizontal = 16.dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Avatar(
+            avatarData = avatarData,
+            avatarType = avatarType,
+        )
+
+        Spacer(modifier = Modifier.width(16.dp))
+
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(vertical = 12.dp),
+            verticalArrangement = Arrangement.spacedBy(2.dp),
+        ) {
+            Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) {
+                Text(
+                    modifier = Modifier.weight(1f),
+                    text = roomName,
+                    maxLines = 1,
+                    style = ElementTheme.typography.fontBodyLgMedium,
+                )
+                Text(
+                    text = formattedTimestamp,
+                    maxLines = 1,
+                    style = ElementTheme.typography.fontBodySmRegular,
+                    color = ElementTheme.colors.textSecondary,
+                )
+            }
+
+            content.caption?.let {
+                Text(
+                    text = it,
+                    maxLines = 2,
+                    overflow = TextOverflow.Ellipsis,
+                    style = ElementTheme.typography.fontBodyMdRegular,
+                    color = ElementTheme.colors.textSecondary,
+                )
+            }
+            Row(
+                modifier = Modifier
+                    .fillMaxWidth(1f)
+                    .background(ElementTheme.colors.bgSubtleSecondary, shape = RoundedCornerShape(12.dp))
+                    .padding(horizontal = 12.dp, vertical = 8.dp),
+                horizontalArrangement = Arrangement.spacedBy(8.dp),
+                verticalAlignment = Alignment.CenterVertically,
+            ) {
+                AttachmentThumbnail(
+                    modifier = Modifier
+                        .size(36.dp)
+                        .clip(RoundedCornerShape(4.dp)),
+                    info = AttachmentThumbnailInfo(
+                        type = content.thumbnailType,
+                        thumbnailSource = content.thumbnailSource,
+                        textContent = null,
+                        blurHash = content.blurhash,
+                    ),
+                    thumbnailSize = 36.dp.roundToPx().toLong(),
+                    backgroundColor = ElementTheme.colors.bgCanvasDefault,
+                )
+
+                Column {
+                    Text(
+                        text = content.filename,
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis,
+                        style = ElementTheme.typography.fontBodyLgRegular,
+                    )
+
+                    Row(
+                        horizontalArrangement = Arrangement.spacedBy(4.dp),
+                    ) {
+                        content.extension?.let {
+                            Text(
+                                text = it,
+                                maxLines = 1,
+                                overflow = TextOverflow.Ellipsis,
+                                style = ElementTheme.typography.fontBodySmRegular,
+                                color = ElementTheme.colors.textSecondary,
+                            )
+                        }
+                        content.formattedSize?.let {
+                            Text(
+                                text = "($it)",
+                                maxLines = 1,
+                                overflow = TextOverflow.Ellipsis,
+                                style = ElementTheme.typography.fontBodySmRegular,
+                                color = ElementTheme.colors.textSecondary,
+                            )
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+private fun Modifier.addSeparatorLine(color: Color, isLastItem: Boolean): Modifier {
+    if (isLastItem) return this
+
+    return this.drawBehind {
+        val strokeWidthPx = 1.dp.toPx()
+        drawLine(
+            color = color,
+            start = Offset(0f, size.height - strokeWidthPx),
+            end = Offset(size.width, size.height - strokeWidthPx),
+            strokeWidth = strokeWidthPx,
+        )
+    }
+}
+
+@PreviewsDayNight
+@Composable
+internal fun GlobalSearchViewPreview(
+    @PreviewParameter(GlobalSearchStatePreviewParam::class) state: GlobalSearchState,
+) {
+    ElementPreview {
+        GlobalSearchView(
+            state = state,
+            onSelectSearchResult = { _, _ -> },
+        )
+    }
+}

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchDataSource.kt

@@ -46,6 +46,8 @@ class RoomListSearchDataSource(
         coroutineScope = coroutineScope
     )
 
+    val loadingState = roomList.loadingState
+
     val roomSummaries: Flow<ImmutableList<RoomListRoomSummary>> = roomList.summaries
         .map { roomSummaries ->
             roomSummaries

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchStatePreviewParam.kt

@@ -15,7 +15,7 @@ import io.element.android.features.home.impl.roomlist.aRoomListRoomSummaryList
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 
-class RoomListSearchStateProvider : PreviewParameterProvider<RoomListSearchState> {
+class RoomListSearchStatePreviewParam : PreviewParameterProvider<RoomListSearchState> {
     override val values: Sequence<RoomListSearchState>
         get() = sequenceOf(
             aRoomListSearchState(),

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchView.kt

@@ -196,7 +196,7 @@ private fun RoomListSearchContent(
 
 @PreviewsDayNight
 @Composable
-internal fun RoomListSearchContentPreview(@PreviewParameter(RoomListSearchStateProvider::class) state: RoomListSearchState) = ElementPreview {
+internal fun RoomListSearchContentPreview(@PreviewParameter(RoomListSearchStatePreviewParam::class) state: RoomListSearchState) = ElementPreview {
     RoomListSearchContent(
         state = state,
         hideInvitesAvatars = false,

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spacefilters/SpaceFiltersStatePreviewParam.kt

@@ -15,7 +15,7 @@ import io.element.android.libraries.matrix.api.spaces.SpaceServiceFilter
 import io.element.android.libraries.previewutils.room.aSpaceRoom
 import kotlinx.collections.immutable.toImmutableList
 
-class SpaceFiltersStateProvider : PreviewParameterProvider<SpaceFiltersState> {
+class SpaceFiltersStatePreviewParam : PreviewParameterProvider<SpaceFiltersState> {
     override val values: Sequence<SpaceFiltersState>
         get() = sequenceOf(
             aSelectingSpaceFiltersState(),