Merge branch 'develop' into feat/polls-max-selections

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

@@ -39,7 +39,7 @@ fun AnalyticsPreferencesView(
     )
     Column(modifier) {
         ListItem(
-            headlineContent = {
+            content = {
                 Text(stringResource(id = R.string.screen_analytics_settings_share_data))
             },
             supportingContent = {

features/analytics/api/src/main/res/values-ca/translations.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_analytics_settings_help_us_improve">"Comparteix dades d\'ús anònimes per ajudar-nos a identificar problemes."</string>
+  <string name="screen_analytics_settings_read_terms">"Pots llegir tots els nostres termes %1$s."</string>
+  <string name="screen_analytics_settings_read_terms_content_link">"aquí"</string>
+  <string name="screen_analytics_settings_share_data">"Comparteix dades analítiques"</string>
+</resources>

features/analytics/api/src/main/res/values-ja/translations.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_analytics_settings_help_us_improve">"改善のため、匿名の使用データの共有にご協力ください。"</string>
+  <string name="screen_analytics_settings_read_terms">"規約の全文は%1$sから確認することができます。"</string>
+  <string name="screen_analytics_settings_read_terms_content_link">"こちら"</string>
+  <string name="screen_analytics_settings_share_data">"使用データを共有"</string>
+</resources>

features/analytics/api/src/main/res/values-lt/translations.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_analytics_settings_help_us_improve">"Dalinkitės anoniminiais naudojimo duomenimis ir padėkite mums nustatyti problemas."</string>
+  <string name="screen_analytics_settings_help_us_improve">"Bendrinkite anoniminius naudojimo duomenis, kad padėtumėte mums nustatyti problemas."</string>
   <string name="screen_analytics_settings_read_terms">"Galite perskaityti visas mūsų sąlygas %1$s."</string>
   <string name="screen_analytics_settings_read_terms_content_link">"čia"</string>
-  <string name="screen_analytics_settings_share_data">"Dalytis analitiniais duomenimis"</string>
+  <string name="screen_analytics_settings_share_data">"Bendrinti analitinius duomenis"</string>
 </resources>

features/analytics/api/src/main/res/values-vi/translations.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_analytics_settings_help_us_improve">"Chia sẻ dữ liệu sử dụng ẩn danh để giúp chúng tôi xác định vấn đề."</string>
+  <string name="screen_analytics_settings_read_terms">"Bạn có thể xem tất cả điều khoản của chúng tôi tại %1$s"</string>
+  <string name="screen_analytics_settings_read_terms_content_link">"tại đây"</string>
+  <string name="screen_analytics_settings_share_data">"Chia sẻ dữ liệu phân tích"</string>
+</resources>

features/analytics/api/src/main/res/values-zh/translations.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_analytics_settings_help_us_improve">"共享匿名使用数据以帮助我们排查问题。"</string>
-  <string name="screen_analytics_settings_read_terms">"您可以阅读我们的所有条款 %1$s。"</string>
+  <string name="screen_analytics_settings_read_terms">"你可以点击 %1$s 阅读我们的所有条款。"</string>
   <string name="screen_analytics_settings_read_terms_content_link">"此处"</string>
   <string name="screen_analytics_settings_share_data">"共享分析数据"</string>
 </resources>

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

@@ -31,12 +31,12 @@ import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.features.analytics.api.AnalyticsOptInEvents
 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.organisms.InfoListItem
-import io.element.android.libraries.designsystem.atomic.organisms.InfoListOrganism
 import io.element.android.libraries.designsystem.atomic.pages.HeaderFooterPage
 import io.element.android.libraries.designsystem.background.OnboardingBackground
 import io.element.android.libraries.designsystem.components.BigIcon
 import io.element.android.libraries.designsystem.components.ClickableLinkText
+import io.element.android.libraries.designsystem.components.visuallist.VisualList
+import io.element.android.libraries.designsystem.components.visuallist.VisualListItemData
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.text.buildAnnotatedStringWithStyledPart
@@ -129,22 +129,21 @@ private fun AnalyticsOptInContent() {
             verticalBias = -0.4f
         )
     ) {
-        InfoListOrganism(
+        VisualList(
             items = persistentListOf(
-                InfoListItem(
+                VisualListItemData(
                     message = stringResource(id = R.string.screen_analytics_prompt_data_usage),
                     iconVector = CompoundIcons.CheckCircle(),
                 ),
-                InfoListItem(
+                VisualListItemData(
                     message = stringResource(id = R.string.screen_analytics_prompt_third_party_sharing),
                     iconVector = CompoundIcons.CheckCircle(),
                 ),
-                InfoListItem(
+                VisualListItemData(
                     message = stringResource(id = R.string.screen_analytics_prompt_settings),
                     iconVector = CompoundIcons.CheckCircle(),
                 ),
             ),
-            textStyle = ElementTheme.typography.fontBodyLgMedium,
             iconTint = ElementTheme.colors.iconSuccessPrimary,
         )
     }

features/analytics/impl/src/main/res/values-ca/translations.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_analytics_prompt_data_usage">"No registrarem ni elaborarem perfils de cap dada personal"</string>
+  <string name="screen_analytics_prompt_help_us_improve">"Comparteix dades d\'ús anònimes per ajudar-nos a identificar problemes."</string>
+  <string name="screen_analytics_prompt_read_terms">"Pots llegir tots els nostres termes %1$s."</string>
+  <string name="screen_analytics_prompt_read_terms_content_link">"aquí"</string>
+  <string name="screen_analytics_prompt_settings">"Ho pots desactivar en qualsevol moment"</string>
+  <string name="screen_analytics_prompt_third_party_sharing">"No compartirem les teves dades amb tercers"</string>
+  <string name="screen_analytics_prompt_title">"Ajuda\'ns a millorar %1$s"</string>
+</resources>

features/analytics/impl/src/main/res/values-ja/translations.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_analytics_prompt_data_usage">"いかなる個人情報も記録, 分析されることはありません"</string>
+  <string name="screen_analytics_prompt_help_us_improve">"改善のため、匿名の使用データの共有にご協力ください。"</string>
+  <string name="screen_analytics_prompt_read_terms">"規約の全文は%1$sから確認することができます。"</string>
+  <string name="screen_analytics_prompt_read_terms_content_link">"こちら"</string>
+  <string name="screen_analytics_prompt_settings">"いつでも設定は変更できます"</string>
+  <string name="screen_analytics_prompt_third_party_sharing">"情報が第三者に共有されることはありません"</string>
+  <string name="screen_analytics_prompt_title">"%1$s の改善にご協力ください"</string>
+</resources>

features/analytics/impl/src/main/res/values-lt/translations.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_analytics_prompt_data_usage">"Mes nekaupsime ir neprofiliuosime jokių asmens duomenų"</string>
-  <string name="screen_analytics_prompt_help_us_improve">"Dalinkitės anoniminiais naudojimo duomenimis ir padėkite mums nustatyti problemas."</string>
+  <string name="screen_analytics_prompt_data_usage">"Mes neįrašysime ar neprofiliuosime jokių asmeninių duomenų."</string>
+  <string name="screen_analytics_prompt_help_us_improve">"Bendrinkite anoniminius naudojimo duomenis, kad padėtumėte mums nustatyti problemas."</string>
   <string name="screen_analytics_prompt_read_terms">"Galite perskaityti visas mūsų sąlygas %1$s."</string>
   <string name="screen_analytics_prompt_read_terms_content_link">"čia"</string>
-  <string name="screen_analytics_prompt_settings">"Tai galite bet kada išjungti"</string>
-  <string name="screen_analytics_prompt_third_party_sharing">"Mes nesidalinsime Jūsų duomenimis su trečiosiomis šalimis"</string>
-  <string name="screen_analytics_prompt_title">"Padėkite pagerinti %1$s"</string>
+  <string name="screen_analytics_prompt_settings">"Tai galite išjungti bet kuriuo metu."</string>
+  <string name="screen_analytics_prompt_third_party_sharing">"Mes nebendrinsime jūsų duomenų su trečiosiomis šalimis."</string>
+  <string name="screen_analytics_prompt_title">"Padėkite patobulinti „%1$s“"</string>
 </resources>

features/analytics/impl/src/main/res/values-vi/translations.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_analytics_prompt_data_usage">"Chúng tôi sẽ không ghi lại hoặc lập hồ sơ bất kỳ dữ liệu cá nhân nào."</string>
+  <string name="screen_analytics_prompt_help_us_improve">"Chia sẻ dữ liệu sử dụng ẩn danh để giúp chúng tôi xác định vấn đề."</string>
+  <string name="screen_analytics_prompt_read_terms">"Bạn có thể xem tất cả điều khoản của chúng tôi tại %1$s"</string>
+  <string name="screen_analytics_prompt_read_terms_content_link">"tại đây"</string>
+  <string name="screen_analytics_prompt_settings">"Bạn có thể tắt tính năng này bất cứ lúc nào"</string>
+  <string name="screen_analytics_prompt_third_party_sharing">"Chúng tôi sẽ không chia sẻ dữ liệu của bạn với bên thứ ba."</string>
+  <string name="screen_analytics_prompt_title">"Giúp cải thiện %1$s"</string>
+</resources>

features/analytics/impl/src/main/res/values-zh/translations.xml

@@ -2,9 +2,9 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_analytics_prompt_data_usage">"我们不会记录或分析任何个人数据"</string>
   <string name="screen_analytics_prompt_help_us_improve">"共享匿名使用数据以帮助我们排查问题。"</string>
-  <string name="screen_analytics_prompt_read_terms">"您可以阅读我们的所有条款 %1$s。"</string>
+  <string name="screen_analytics_prompt_read_terms">"你可以点击 %1$s 阅读我们的所有条款。"</string>
   <string name="screen_analytics_prompt_read_terms_content_link">"此处"</string>
   <string name="screen_analytics_prompt_settings">"可以随时关闭此功能"</string>
-  <string name="screen_analytics_prompt_third_party_sharing">"我们不会与第三方共享您的数据"</string>
+  <string name="screen_analytics_prompt_third_party_sharing">"我们不会与第三方共享你的数据"</string>
   <string name="screen_analytics_prompt_title">"帮助改进 %1$s"</string>
 </resources>

features/announcement/api/src/main/kotlin/io/element/android/features/announcement/api/Announcement.kt

@@ -8,7 +8,13 @@
 
 package io.element.android.features.announcement.api
 
-enum class Announcement {
-    Space,
-    NewNotificationSound,
+import androidx.compose.runtime.Immutable
+
+@Immutable
+sealed interface Announcement {
+    enum class Fullscreen : Announcement {
+        Space,
+    }
+
+    data object NewNotificationSound : Announcement
 }

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

@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2025 New Vector 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.announcement.impl
+
+import io.element.android.features.announcement.api.Announcement
+
+sealed interface AnnouncementEvent {
+    data class Continue(
+        val announcement: Announcement.Fullscreen,
+    ) : AnnouncementEvent
+}

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

@@ -12,12 +12,16 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import dev.zacsweers.metro.Inject
 import io.element.android.features.announcement.api.Announcement
 import io.element.android.features.announcement.impl.store.AnnouncementStatus
 import io.element.android.features.announcement.impl.store.AnnouncementStore
 import io.element.android.libraries.architecture.Presenter
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.launch
 
 @Inject
 class AnnouncementPresenter(
@@ -25,13 +29,39 @@ class AnnouncementPresenter(
 ) : Presenter<AnnouncementState> {
     @Composable
     override fun present(): AnnouncementState {
-        val showSpaceAnnouncement by remember {
-            announcementStore.announcementStatusFlow(Announcement.Space).map {
-                it == AnnouncementStatus.Show
+        val coroutineScope = rememberCoroutineScope()
+
+        val fullscreenAnnouncementToShow by remember {
+            combine(
+                flowOf(Unit),
+                announcementStore.announcementStatusFlow(Announcement.Fullscreen.Space).map {
+                    it == AnnouncementStatus.Show
+                },
+                // Add other announcements here when needed
+            ) { _, showFullscreenSpace ->
+                when {
+                    showFullscreenSpace -> Announcement.Fullscreen.Space
+                    else -> {
+                        null
+                    }
+                }
             }
-        }.collectAsState(false)
+        }.collectAsState(null)
+
+        fun handle(event: AnnouncementEvent) {
+            when (event) {
+                is AnnouncementEvent.Continue -> coroutineScope.launch {
+                    announcementStore.setAnnouncementStatus(
+                        announcement = event.announcement,
+                        status = AnnouncementStatus.Shown,
+                    )
+                }
+            }
+        }
+
         return AnnouncementState(
-            showSpaceAnnouncement = showSpaceAnnouncement,
+            announcement = fullscreenAnnouncementToShow,
+            eventSink = ::handle,
         )
     }
 }

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

@@ -8,12 +8,9 @@
 
 package io.element.android.features.announcement.impl
 
-data class AnnouncementState(
-    val showSpaceAnnouncement: Boolean,
-)
+import io.element.android.features.announcement.api.Announcement
 
-fun anAnnouncementState(
-    showSpaceAnnouncement: Boolean = false,
-) = AnnouncementState(
-    showSpaceAnnouncement = showSpaceAnnouncement,
+data class AnnouncementState(
+    val announcement: Announcement.Fullscreen?,
+    val eventSink: (AnnouncementEvent) -> Unit,
 )

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

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2025 New Vector 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.announcement.impl
+
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import io.element.android.features.announcement.api.Announcement
+
+open class AnnouncementStateProvider : PreviewParameterProvider<AnnouncementState> {
+    override val values: Sequence<AnnouncementState>
+        get() = sequenceOf(
+            anAnnouncementState(),
+            anAnnouncementState(
+                announcement = Announcement.Fullscreen.Space,
+            ),
+        )
+}
+
+fun anAnnouncementState(
+    announcement: Announcement.Fullscreen? = null,
+    eventSink: (AnnouncementEvent) -> Unit = {},
+) = AnnouncementState(
+    announcement = announcement,
+    eventSink = eventSink,
+)

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

@@ -8,35 +8,28 @@
 
 package io.element.android.features.announcement.impl
 
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.fadeOut
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
 import io.element.android.features.announcement.api.Announcement
 import io.element.android.features.announcement.api.AnnouncementService
-import io.element.android.features.announcement.impl.spaces.SpaceAnnouncementState
-import io.element.android.features.announcement.impl.spaces.SpaceAnnouncementView
+import io.element.android.features.announcement.impl.fullscreen.FullscreenAnnouncementView
 import io.element.android.features.announcement.impl.store.AnnouncementStatus
 import io.element.android.features.announcement.impl.store.AnnouncementStore
-import io.element.android.libraries.architecture.Presenter
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.flowOf
 
 @ContributesBinding(AppScope::class)
 class DefaultAnnouncementService(
     private val announcementStore: AnnouncementStore,
-    private val announcementPresenter: Presenter<AnnouncementState>,
-    private val spaceAnnouncementPresenter: Presenter<SpaceAnnouncementState>,
+    private val announcementPresenter: AnnouncementPresenter,
 ) : AnnouncementService {
     override suspend fun showAnnouncement(announcement: Announcement) {
         when (announcement) {
-            Announcement.Space -> showSpaceAnnouncement()
+            is Announcement.Fullscreen -> showFullscreenAnnouncement(announcement)
             Announcement.NewNotificationSound -> {
                 announcementStore.setAnnouncementStatus(Announcement.NewNotificationSound, AnnouncementStatus.Show)
             }
@@ -49,13 +42,10 @@ class DefaultAnnouncementService(
 
     override fun announcementsToShowFlow(): Flow<List<Announcement>> {
         return combine(
-            announcementStore.announcementStatusFlow(Announcement.Space),
+            flowOf(Unit),
             announcementStore.announcementStatusFlow(Announcement.NewNotificationSound),
-        ) { spaceAnnouncementStatus, newNotificationSoundStatus ->
+        ) { _, newNotificationSoundStatus ->
             buildList {
-                if (spaceAnnouncementStatus == AnnouncementStatus.Show) {
-                    add(Announcement.Space)
-                }
                 if (newNotificationSoundStatus == AnnouncementStatus.Show) {
                     add(Announcement.NewNotificationSound)
                 }
@@ -63,27 +53,19 @@ class DefaultAnnouncementService(
         }
     }
 
-    private suspend fun showSpaceAnnouncement() {
-        val currentValue = announcementStore.announcementStatusFlow(Announcement.Space).first()
+    private suspend fun showFullscreenAnnouncement(announcement: Announcement.Fullscreen) {
+        val currentValue = announcementStore.announcementStatusFlow(announcement).first()
         if (currentValue == AnnouncementStatus.NeverShown) {
-            announcementStore.setAnnouncementStatus(Announcement.Space, AnnouncementStatus.Show)
+            announcementStore.setAnnouncementStatus(announcement, AnnouncementStatus.Show)
         }
     }
 
     @Composable
     override fun Render(modifier: Modifier) {
         val announcementState = announcementPresenter.present()
-        Box(modifier = modifier.fillMaxSize()) {
-            AnimatedVisibility(
-                visible = announcementState.showSpaceAnnouncement,
-                enter = fadeIn(),
-                exit = fadeOut(),
-            ) {
-                val spaceAnnouncementState = spaceAnnouncementPresenter.present()
-                SpaceAnnouncementView(
-                    state = spaceAnnouncementState,
-                )
-            }
-        }
+        FullscreenAnnouncementView(
+            state = announcementState,
+            modifier = modifier,
+        )
     }
 }

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

@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2025 New Vector 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.announcement.impl.di
-
-import dev.zacsweers.metro.AppScope
-import dev.zacsweers.metro.BindingContainer
-import dev.zacsweers.metro.Binds
-import dev.zacsweers.metro.ContributesTo
-import io.element.android.features.announcement.impl.AnnouncementPresenter
-import io.element.android.features.announcement.impl.AnnouncementState
-import io.element.android.features.announcement.impl.spaces.SpaceAnnouncementPresenter
-import io.element.android.features.announcement.impl.spaces.SpaceAnnouncementState
-import io.element.android.libraries.architecture.Presenter
-
-@ContributesTo(AppScope::class)
-@BindingContainer
-interface AnnouncementModule {
-    @Binds
-    fun bindAnnouncementPresenter(presenter: AnnouncementPresenter): Presenter<AnnouncementState>
-
-    @Binds
-    fun bindSpaceAnnouncementPresenter(presenter: SpaceAnnouncementPresenter): Presenter<SpaceAnnouncementState>
-}

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

@@ -0,0 +1,223 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2025 New Vector 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.announcement.impl.fullscreen
+
+import androidx.activity.compose.BackHandler
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+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.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.libraries.designsystem.atomic.molecules.ButtonColumnMolecule
+import io.element.android.libraries.designsystem.atomic.molecules.IconTitleSubtitleMolecule
+import io.element.android.libraries.designsystem.atomic.pages.HeaderFooterPage
+import io.element.android.libraries.designsystem.components.BigIcon
+import io.element.android.libraries.designsystem.components.visuallist.VisualList
+import io.element.android.libraries.designsystem.components.visuallist.VisualListItemData
+import io.element.android.libraries.designsystem.preview.ElementPreview
+import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.theme.components.Button
+import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.ui.strings.CommonStrings
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.persistentListOf
+
+/**
+ * Ref: https://www.figma.com/design/kcnHxunG1LDWXsJhaNuiHz/ER-145--Spaces-on-Element-X?node-id=4593-40181
+ */
+@Composable
+fun FullscreenAnnouncementView(
+    state: AnnouncementState,
+    modifier: Modifier = Modifier,
+) {
+    // Ensure that the content stays visible during the exit animation
+    var fullscreenAnnouncement by remember { mutableStateOf<Announcement.Fullscreen?>(null) }
+    if (state.announcement != null) {
+        fullscreenAnnouncement = state.announcement
+    }
+    Box(modifier = modifier.fillMaxSize()) {
+        AnimatedVisibility(
+            visible = state.announcement != null,
+            enter = fadeIn(),
+            exit = fadeOut(),
+        ) {
+            fullscreenAnnouncement?.let {
+                FullscreenAnnouncementView(
+                    announcement = it,
+                    eventSink = state.eventSink,
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun FullscreenAnnouncementView(
+    announcement: Announcement.Fullscreen,
+    eventSink: (AnnouncementEvent) -> Unit,
+    modifier: Modifier = Modifier
+) {
+    fun onContinue() {
+        eventSink(AnnouncementEvent.Continue(announcement))
+    }
+
+    BackHandler(onBack = ::onContinue)
+    HeaderFooterPage(
+        modifier = modifier,
+        isScrollable = true,
+        contentPadding = PaddingValues(top = 24.dp, start = 16.dp, end = 16.dp, bottom = 24.dp),
+        header = {
+            FullscreenAnnouncementHeader(announcement)
+        },
+        content = {
+            FullscreenAnnouncementContent(
+                modifier = Modifier.padding(horizontal = 8.dp),
+                announcement = announcement,
+            )
+        },
+        footer = {
+            FullscreenAnnouncementFooter(
+                onContinue = ::onContinue,
+            )
+        }
+    )
+}
+
+@Composable
+private fun FullscreenAnnouncementHeader(
+    announcement: Announcement.Fullscreen,
+    modifier: Modifier = Modifier,
+) {
+    IconTitleSubtitleMolecule(
+        modifier = modifier.padding(top = 16.dp, bottom = 16.dp),
+        title = announcement.title(),
+        showBetaLabel = true,
+        subTitle = announcement.subtitle(),
+        iconStyle = BigIcon.Style.Default(
+            vectorIcon = announcement.icon(),
+            usePrimaryTint = true,
+        ),
+    )
+}
+
+@Composable
+private fun FullscreenAnnouncementContent(
+    announcement: Announcement.Fullscreen,
+    modifier: Modifier = Modifier,
+) {
+    Column(
+        modifier = modifier.fillMaxSize(),
+    ) {
+        VisualList(
+            modifier = Modifier.fillMaxWidth(),
+            items = announcement.items(),
+            iconSize = 24.dp
+        )
+        announcement.notice()?.let { notice ->
+            Text(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(vertical = 16.dp),
+                text = notice,
+                style = ElementTheme.typography.fontBodyMdRegular,
+                color = ElementTheme.colors.textSecondary,
+                textAlign = TextAlign.Center,
+            )
+        }
+    }
+}
+
+@Composable
+private fun FullscreenAnnouncementFooter(
+    onContinue: () -> Unit,
+) {
+    ButtonColumnMolecule(
+        modifier = Modifier.padding(bottom = 8.dp)
+    ) {
+        Button(
+            text = stringResource(id = CommonStrings.action_continue),
+            onClick = onContinue,
+            modifier = Modifier.fillMaxWidth(),
+        )
+    }
+}
+
+@Composable
+private fun Announcement.Fullscreen.title() = when (this) {
+    Announcement.Fullscreen.Space -> "Introducing Spaces"
+}
+
+@Composable
+private fun Announcement.Fullscreen.subtitle() = when (this) {
+    Announcement.Fullscreen.Space -> "Welcome to the beta version of Spaces! With this first version you can:"
+}
+
+@Composable
+private fun Announcement.Fullscreen.icon() = when (this) {
+    Announcement.Fullscreen.Space -> CompoundIcons.SpaceSolid()
+}
+
+@Composable
+private fun Announcement.Fullscreen.items(): ImmutableList<VisualListItemData> = when (this) {
+    Announcement.Fullscreen.Space -> persistentListOf(
+        VisualListItemData(
+            message = "View spaces you\'ve created or joined",
+            iconVector = CompoundIcons.VisibilityOn(),
+        ),
+        VisualListItemData(
+            message = "Accept or decline invites to spaces",
+            iconVector = CompoundIcons.Email(),
+        ),
+        VisualListItemData(
+            message = "Discover any rooms you can join in your spaces",
+            iconVector = CompoundIcons.Search(),
+        ),
+        VisualListItemData(
+            message = "Join public spaces",
+            iconVector = CompoundIcons.Explore(),
+        ),
+        VisualListItemData(
+            message = "Leave any spaces you’ve joined",
+            iconVector = CompoundIcons.Leave(),
+        ),
+    )
+}
+
+@Composable
+private fun Announcement.Fullscreen.notice(): String? = when (this) {
+    Announcement.Fullscreen.Space -> "Filtering, creating and managing spaces is coming soon."
+}
+
+@PreviewsDayNight
+@Composable
+internal fun FullscreenAnnouncementViewPreview(@PreviewParameter(AnnouncementStateProvider::class) state: AnnouncementState) = ElementPreview {
+    FullscreenAnnouncementView(
+        state = state,
+    )
+}

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

@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2025 New Vector 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.announcement.impl.spaces
-
-sealed interface SpaceAnnouncementEvents {
-    data object Continue : SpaceAnnouncementEvents
-}

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

@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2025 New Vector 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.announcement.impl.spaces
-
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.rememberCoroutineScope
-import dev.zacsweers.metro.Inject
-import io.element.android.features.announcement.api.Announcement
-import io.element.android.features.announcement.impl.store.AnnouncementStatus
-import io.element.android.features.announcement.impl.store.AnnouncementStore
-import io.element.android.libraries.architecture.Presenter
-import kotlinx.coroutines.launch
-
-@Inject
-class SpaceAnnouncementPresenter(
-    private val announcementStore: AnnouncementStore,
-) : Presenter<SpaceAnnouncementState> {
-    @Composable
-    override fun present(): SpaceAnnouncementState {
-        val localCoroutineScope = rememberCoroutineScope()
-
-        fun handleEvent(event: SpaceAnnouncementEvents) {
-            when (event) {
-                SpaceAnnouncementEvents.Continue -> localCoroutineScope.launch {
-                    announcementStore.setAnnouncementStatus(Announcement.Space, AnnouncementStatus.Shown)
-                }
-            }
-        }
-
-        return SpaceAnnouncementState(
-            eventSink = ::handleEvent,
-        )
-    }
-}

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

@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2025 New Vector 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.announcement.impl.spaces
-
-data class SpaceAnnouncementState(
-    val eventSink: (SpaceAnnouncementEvents) -> Unit
-)

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

@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2025 New Vector 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.announcement.impl.spaces
-
-import androidx.compose.ui.tooling.preview.PreviewParameterProvider
-
-open class SpaceAnnouncementStateProvider : PreviewParameterProvider<SpaceAnnouncementState> {
-    override val values: Sequence<SpaceAnnouncementState>
-        get() = sequenceOf(
-            aSpaceAnnouncementState(),
-        )
-}
-
-fun aSpaceAnnouncementState(
-    eventSink: (SpaceAnnouncementEvents) -> Unit = {},
-) = SpaceAnnouncementState(
-    eventSink = eventSink,
-)

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

@@ -1,158 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2025 New Vector 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.announcement.impl.spaces
-
-import androidx.activity.compose.BackHandler
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.style.TextAlign
-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.announcement.impl.R
-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.organisms.InfoListItem
-import io.element.android.libraries.designsystem.atomic.organisms.InfoListOrganism
-import io.element.android.libraries.designsystem.atomic.pages.HeaderFooterPage
-import io.element.android.libraries.designsystem.components.BigIcon
-import io.element.android.libraries.designsystem.preview.ElementPreview
-import io.element.android.libraries.designsystem.preview.PreviewsDayNight
-import io.element.android.libraries.designsystem.theme.components.Button
-import io.element.android.libraries.designsystem.theme.components.Text
-import io.element.android.libraries.ui.strings.CommonStrings
-import kotlinx.collections.immutable.persistentListOf
-
-/**
- * Ref: https://www.figma.com/design/kcnHxunG1LDWXsJhaNuiHz/ER-145--Spaces-on-Element-X?node-id=4593-40181
- */
-@Composable
-fun SpaceAnnouncementView(
-    state: SpaceAnnouncementState,
-    modifier: Modifier = Modifier,
-) {
-    val eventSink = state.eventSink
-
-    fun onContinue() {
-        eventSink(SpaceAnnouncementEvents.Continue)
-    }
-
-    BackHandler(onBack = ::onContinue)
-    HeaderFooterPage(
-        modifier = modifier,
-        isScrollable = true,
-        contentPadding = PaddingValues(top = 24.dp, start = 16.dp, end = 16.dp, bottom = 24.dp),
-        header = {
-            SpaceAnnouncementHeader()
-        },
-        content = {
-            SpaceAnnouncementContent(
-                modifier = Modifier.padding(horizontal = 8.dp),
-            )
-        },
-        footer = {
-            SpaceAnnouncementFooter(
-                onContinue = ::onContinue,
-            )
-        }
-    )
-}
-
-@Composable
-private fun SpaceAnnouncementHeader(
-    modifier: Modifier = Modifier,
-) {
-    IconTitleSubtitleMolecule(
-        modifier = modifier.padding(top = 16.dp, bottom = 16.dp),
-        title = stringResource(id = R.string.screen_space_announcement_title),
-        showBetaLabel = true,
-        subTitle = stringResource(id = R.string.screen_space_announcement_subtitle),
-        iconStyle = BigIcon.Style.Default(
-            vectorIcon = CompoundIcons.SpaceSolid(),
-            usePrimaryTint = true,
-        ),
-    )
-}
-
-@Composable
-private fun SpaceAnnouncementContent(
-    modifier: Modifier = Modifier,
-) {
-    Column(
-        modifier = modifier.fillMaxSize(),
-    ) {
-        InfoListOrganism(
-            modifier = Modifier.fillMaxWidth(),
-            items = persistentListOf(
-                InfoListItem(
-                    message = stringResource(id = R.string.screen_space_announcement_item1),
-                    iconVector = CompoundIcons.VisibilityOn(),
-                ),
-                InfoListItem(
-                    message = stringResource(id = R.string.screen_space_announcement_item2),
-                    iconVector = CompoundIcons.Email(),
-                ),
-                InfoListItem(
-                    message = stringResource(id = R.string.screen_space_announcement_item3),
-                    iconVector = CompoundIcons.Search(),
-                ),
-                InfoListItem(
-                    message = stringResource(id = R.string.screen_space_announcement_item4),
-                    iconVector = CompoundIcons.Explore(),
-                ),
-                InfoListItem(
-                    message = stringResource(id = R.string.screen_space_announcement_item5),
-                    iconVector = CompoundIcons.Leave(),
-                ),
-            ),
-            textStyle = ElementTheme.typography.fontBodyLgMedium,
-            iconTint = ElementTheme.colors.iconSecondary,
-            iconSize = 24.dp
-        )
-        Text(
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(vertical = 16.dp),
-            text = stringResource(id = R.string.screen_space_announcement_notice),
-            style = ElementTheme.typography.fontBodyMdRegular,
-            color = ElementTheme.colors.textSecondary,
-            textAlign = TextAlign.Center,
-        )
-    }
-}
-
-@Composable
-private fun SpaceAnnouncementFooter(
-    onContinue: () -> Unit,
-) {
-    ButtonColumnMolecule(
-        modifier = Modifier.padding(bottom = 8.dp)
-    ) {
-        Button(
-            text = stringResource(id = CommonStrings.action_continue),
-            onClick = onContinue,
-            modifier = Modifier.fillMaxWidth(),
-        )
-    }
-}
-
-@PreviewsDayNight
-@Composable
-internal fun SpaceAnnouncementViewPreview(@PreviewParameter(SpaceAnnouncementStateProvider::class) state: SpaceAnnouncementState) = ElementPreview {
-    SpaceAnnouncementView(
-        state = state,
-    )
-}

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

@@ -35,9 +35,11 @@ class DefaultAnnouncementStore(
 
     override fun announcementStatusFlow(announcement: Announcement): Flow<AnnouncementStatus> {
         val key = announcement.toKey()
-        // For NewNotificationSound, a migration will set it to Show on application upgrade (see AppMigration08)
+        // Default-status convention: Shown for one-shot intro/feature announcements that should
+        // NOT replay on first launch (Fullscreen.Space is disabled; NewNotificationSound is opted
+        // in by AppMigration08).
         val defaultStatus = when (announcement) {
-            Announcement.Space -> AnnouncementStatus.NeverShown
+            Announcement.Fullscreen.Space -> AnnouncementStatus.Shown
             Announcement.NewNotificationSound -> AnnouncementStatus.Shown
         }
         return store.data.map { prefs ->
@@ -52,6 +54,6 @@ class DefaultAnnouncementStore(
 }
 
 private fun Announcement.toKey() = when (this) {
-    Announcement.Space -> spaceAnnouncementKey
+    Announcement.Fullscreen.Space -> spaceAnnouncementKey
     Announcement.NewNotificationSound -> newNotificationSoundKey
 }

features/announcement/impl/src/main/res/values-bg/translations.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item4">"Присъединете се към обществени пространства"</string>
-</resources>

features/announcement/impl/src/main/res/values-cs/translations.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item1">"Zobrazit prostory, které jste vytvořili nebo ke kterým jste se připojili"</string>
-  <string name="screen_space_announcement_item2">"Přijmout nebo odmítnout pozvánky do prostorů"</string>
-  <string name="screen_space_announcement_item3">"Objevte všechny místnosti, do kterých můžete vstoupit ve svých prostorech"</string>
-  <string name="screen_space_announcement_item4">"Připojit se k veřejným prostorům"</string>
-  <string name="screen_space_announcement_item5">"Opustit všechny prostory, ke kterým jste se připojili"</string>
-  <string name="screen_space_announcement_notice">"Filtrování, vytváření a správa prostorů bude brzy k dispozici."</string>
-  <string name="screen_space_announcement_subtitle">"Vítejte v beta verzi prostorů! S touto první verzí můžete:"</string>
-  <string name="screen_space_announcement_title">"Představujeme prostory"</string>
-</resources>

features/announcement/impl/src/main/res/values-da/translations.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item1">"Se klynger, du har oprettet eller tilmeldt dig"</string>
-  <string name="screen_space_announcement_item2">"Acceptere eller afvise invitationer til klynger"</string>
-  <string name="screen_space_announcement_item3">"Finde alle rum, du kan deltage i, i dine klynger"</string>
-  <string name="screen_space_announcement_item4">"Deltage i offentlige klynger"</string>
-  <string name="screen_space_announcement_item5">"Forlade de klynger, du har tilsluttet dig"</string>
-  <string name="screen_space_announcement_notice">"Filtrering, oprettelse og administration af klynger kommer snart."</string>
-  <string name="screen_space_announcement_subtitle">"Velkommen til betaversionen af Klynger! Med denne første version kan du:"</string>
-  <string name="screen_space_announcement_title">"Introduktion til Klynger"</string>
-</resources>

features/announcement/impl/src/main/res/values-de/translations.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item1">"Von dir erstellte oder beigetretene Spaces anzeigen"</string>
-  <string name="screen_space_announcement_item2">"Einladungen zu Spaces annehmen oder ablehnen"</string>
-  <string name="screen_space_announcement_item3">"Chats innerhalb deiner Spaces entdecken, um ihnen beizutreten"</string>
-  <string name="screen_space_announcement_item4">"Öffentlichen Spaces beitreten"</string>
-  <string name="screen_space_announcement_item5">"Spaces verlassen, bei denen du Mitglied bist"</string>
-  <string name="screen_space_announcement_notice">"Das Filtern, Erstellen und Verwalten von Spaces ist bald verfügbar."</string>
-  <string name="screen_space_announcement_subtitle">"Willkommen bei der Beta-Version von Spaces! Mit dieser ersten Version kannst du:"</string>
-  <string name="screen_space_announcement_title">"Einführung in Spaces"</string>
-</resources>

features/announcement/impl/src/main/res/values-el/translations.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item1">"Δείτε τους χώρους που έχετε δημιουργήσει ή στους οποίους έχετε εγγραφεί"</string>
-  <string name="screen_space_announcement_item2">"Να αποδεχθείτε ή να απορρίψετε προσκλήσεις σε χώρους"</string>
-  <string name="screen_space_announcement_item3">"Να ανακαλύψτε όλες τις αίθουσες που μπορείτε να συμμετάσχετε στους χώρους σας"</string>
-  <string name="screen_space_announcement_item4">"Να συμμετάσχετε σε δημόσιους χώρους"</string>
-  <string name="screen_space_announcement_item5">"Να αποχωρήστε από χώρους στους οποίους έχετε συμμετάσχει"</string>
-  <string name="screen_space_announcement_notice">"Το φιλτράρισμα, η δημιουργία και η διαχείριση χώρων θα είναι σύντομα διαθέσιμα."</string>
-  <string name="screen_space_announcement_subtitle">"Καλώς ορίσατε στην δοκιμαστική έκδοση των Χώρων! Με αυτήν την πρώτη έκδοση μπορείτε:"</string>
-  <string name="screen_space_announcement_title">"Παρουσιάζοντας τους Χώρους"</string>
-</resources>

features/announcement/impl/src/main/res/values-et/translations.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item1">"Vaadata kogukondi, mille oled loonud või millega oled liitunud"</string>
-  <string name="screen_space_announcement_item2">"Nõustuda kutsetega liitumiseks kogukonnaga või sellest keelduda"</string>
-  <string name="screen_space_announcement_item3">"Uurida neis kogukondades leiduvaid jututube ning nendega liituda"</string>
-  <string name="screen_space_announcement_item4">"Liituda avalike kogukondadega"</string>
-  <string name="screen_space_announcement_item5">"Lahkuda kogukonnast, millega oled liitunud"</string>
-  <string name="screen_space_announcement_notice">"Kogukondade filtreerimine, loomine ja haldamine lisandub peagi"</string>
-  <string name="screen_space_announcement_subtitle">"Tere tulemast kasutama kogukondade beetaversiooni! Selles esimeses versioonis saad sa:"</string>
-  <string name="screen_space_announcement_title">"Võtame kasutusele kogukonnad"</string>
-</resources>

features/announcement/impl/src/main/res/values-fa/translations.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item1">"دیدن فضاهایی که ساخته یا پیوسته‌اید"</string>
-  <string name="screen_space_announcement_item2">"پذیرش یا رد دعوت‌ها به فضاها"</string>
-  <string name="screen_space_announcement_item3">"کشف تمامی اتاق‌هایی که می‌توانید در فضاهایتان بپیوندید"</string>
-  <string name="screen_space_announcement_item4">"پیوستن به فضاهای عمومی"</string>
-  <string name="screen_space_announcement_item5">"ترک هر فضایی که پیوسته‌اید"</string>
-  <string name="screen_space_announcement_notice">"پالایش، ایجاد و مدیریت کردن فضاها به زودی."</string>
-  <string name="screen_space_announcement_subtitle">"به نگارش آزمایشی فضاها خوش آمدید! در این نگارش می‌توانید:"</string>
-  <string name="screen_space_announcement_title">"معرّفی فضاها"</string>
-</resources>

features/announcement/impl/src/main/res/values-fi/translations.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item1">"Nähdä luomasi tai liittymäsi tilat"</string>
-  <string name="screen_space_announcement_item2">"Hyväksyä tai hylätä kutsuja tiloihin"</string>
-  <string name="screen_space_announcement_item3">"Löytää kaikki huoneet, joihin voit liittyä tiloissasi"</string>
-  <string name="screen_space_announcement_item4">"Liittyä julkisiin tiloihin"</string>
-  <string name="screen_space_announcement_item5">"Poistua mistä tahansa tilasta, johon olet liittynyt"</string>
-  <string name="screen_space_announcement_notice">"Tilojen suodatus, luominen ja hallinta on tulossa pian."</string>
-  <string name="screen_space_announcement_subtitle">"Tervetuloa tilojen beetaversioon! Tämän ensimmäisen version avulla voit:"</string>
-  <string name="screen_space_announcement_title">"Esittelyssä tilat"</string>
-</resources>

features/announcement/impl/src/main/res/values-fr/translations.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item1">"Voir les espaces que vous avez créés ou rejoints"</string>
-  <string name="screen_space_announcement_item2">"Accepter ou refuser les invitations aux espaces"</string>
-  <string name="screen_space_announcement_item3">"Découvrir les salons que vous pouvez joindre depuis vos espaces"</string>
-  <string name="screen_space_announcement_item4">"Rejoindre les espaces publics"</string>
-  <string name="screen_space_announcement_item5">"Quitter les espaces dont vous êtes membre."</string>
-  <string name="screen_space_announcement_notice">"Le filtrage, la création et la gestion des espaces seront bientôt disponibles."</string>
-  <string name="screen_space_announcement_subtitle">"Bienvenue dans la version bêta des espaces! Avec cette première version, vous pourrez :"</string>
-  <string name="screen_space_announcement_title">"Ajout des espaces"</string>
-</resources>

features/announcement/impl/src/main/res/values-hr/translations.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item1">"Pregledajte prostore koje ste stvorili ili kojima ste se pridružili"</string>
-  <string name="screen_space_announcement_item2">"Prihvatite ili odbijte pozivnice za prostore"</string>
-  <string name="screen_space_announcement_item3">"Otkrijte sve sobe kojima se možete pridružiti u svojim prostorima"</string>
-  <string name="screen_space_announcement_item4">"Pridružite se javnim prostorima"</string>
-  <string name="screen_space_announcement_item5">"Napustite sve prostore kojima ste se pridružili"</string>
-  <string name="screen_space_announcement_notice">"Uskoro stiže filtriranje i stvaranje prostora te upravljanje njima."</string>
-  <string name="screen_space_announcement_subtitle">"Dobrodošli u beta inačicu prostora! S ovom prvom inačicom možete:"</string>
-  <string name="screen_space_announcement_title">"Predstavljamo prostore"</string>
-</resources>

features/announcement/impl/src/main/res/values-hu/translations.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item1">"Az Ön által létrehozott vagy csatlakozott térek megtekintése"</string>
-  <string name="screen_space_announcement_item2">"A meghívások elfogadására vagy elutasítására a terekhez"</string>
-  <string name="screen_space_announcement_item3">"Szobák felfedezése a terekben, amelyekhez csatlakozhat"</string>
-  <string name="screen_space_announcement_item4">"Csatlakozás nyilvános terekhez"</string>
-  <string name="screen_space_announcement_item5">"Terek elhagyása"</string>
-  <string name="screen_space_announcement_notice">"Terek szűrése, készítése és kezelése hamarosan érkezik."</string>
-  <string name="screen_space_announcement_subtitle">"Üdvözöljük a tér béta verziójában! Ezzel az első verzióval a következőket teheti:"</string>
-  <string name="screen_space_announcement_title">"Bemutatkoznak a terek"</string>
-</resources>

features/announcement/impl/src/main/res/values-it/translations.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item1">"Visualizza gli spazi che hai creato o a cui partecipi"</string>
-  <string name="screen_space_announcement_item2">"Accetta o rifiuta gli inviti agli spazi"</string>
-  <string name="screen_space_announcement_item3">"Scopri tutte le stanze a cui puoi partecipare nei tuoi spazi"</string>
-  <string name="screen_space_announcement_item4">"Unisciti agli spazi pubblici"</string>
-  <string name="screen_space_announcement_item5">"Lascia tutti gli spazi a cui ti sei unito"</string>
-  <string name="screen_space_announcement_notice">"A breve saranno disponibili le funzionalità di filtraggio, creazione e gestione degli spazi."</string>
-  <string name="screen_space_announcement_subtitle">"Benvenuti alla versione beta degli Spazi! Con questa prima versione potrete:"</string>
-  <string name="screen_space_announcement_title">"Ti presentiamo gli Spazi"</string>
-</resources>

features/announcement/impl/src/main/res/values-ko/translations.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item1">"직접 만들거나 참여 중인 스페이스 보기"</string>
-  <string name="screen_space_announcement_item2">"스페이스 초대 수락 또는 거절"</string>
-  <string name="screen_space_announcement_item3">"참여 가능한 스페이스 내 모든 방 탐색"</string>
-  <string name="screen_space_announcement_item4">"공개 스페이스 참여"</string>
-  <string name="screen_space_announcement_item5">"참여 중인 스페이스 나가기"</string>
-  <string name="screen_space_announcement_notice">"스페이스 필터링, 생성 및 관리 기능이 곧 추가될 예정입니다."</string>
-  <string name="screen_space_announcement_subtitle">"스페이스 베타 버전에 오신 것을 환영합니다! 이번 첫 번째 버전에서는 다음과 같은 기능을 이용하실 수 있습니다.:"</string>
-  <string name="screen_space_announcement_title">"스페이스 소개"</string>
-</resources>

features/announcement/impl/src/main/res/values-nb/translations.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item1">"Se områder du har opprettet eller blitt med i"</string>
-  <string name="screen_space_announcement_item2">"Godta eller avslå invitasjoner til områder"</string>
-  <string name="screen_space_announcement_item3">"Oppdag alle rom du kan bli med i i dine områder"</string>
-  <string name="screen_space_announcement_item4">"Bli med i offentlige områder"</string>
-  <string name="screen_space_announcement_item5">"Forlat områder du har blitt med i"</string>
-  <string name="screen_space_announcement_notice">"Oppretting, filtrering og administrasjon av områder kommer snart."</string>
-  <string name="screen_space_announcement_subtitle">"Velkommen til betaversjonen av Områder! Med denne første versjonen kan du:"</string>
-  <string name="screen_space_announcement_title">"Vi introduserer Områder"</string>
-</resources>

features/announcement/impl/src/main/res/values-pl/translations.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item1">"Wyświetlić przestrzenie, które stworzyłeś lub do których dołączyłeś"</string>
-  <string name="screen_space_announcement_item2">"Akceptować lub odrzucać zaproszenia"</string>
-  <string name="screen_space_announcement_item3">"Odkrywać wszystkie pokoje, do których możesz dołączyć w swoich przestrzeniach"</string>
-  <string name="screen_space_announcement_item4">"Dołączać do przestrzeni publicznych"</string>
-  <string name="screen_space_announcement_item5">"Opuszczać jakąkolwiek przestrzeń, do której dołączyłeś"</string>
-  <string name="screen_space_announcement_notice">"Filtrowanie, tworzenie i zarządzanie przestrzeniami pojawi się wkrótce."</string>
-  <string name="screen_space_announcement_subtitle">"Witamy w wersji beta przestrzeni! W tej wersji możesz:"</string>
-  <string name="screen_space_announcement_title">"Przedstawiamy przestrzenie"</string>
-</resources>

features/announcement/impl/src/main/res/values-pt-rBR/translations.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item1">"Visualizar espaços que criou ou entrou"</string>
-  <string name="screen_space_announcement_item2">"Aceitar ou recusar convites aos espaços"</string>
-  <string name="screen_space_announcement_item3">"Descobrir quaisquer salas que você pode entrar nos espaços"</string>
-  <string name="screen_space_announcement_item4">"Entrar espaços públicos"</string>
-  <string name="screen_space_announcement_item5">"Sair de quaisquer espaços que entrou"</string>
-  <string name="screen_space_announcement_notice">"Filtrar, criar, e gerenciar espaços virão em breve."</string>
-  <string name="screen_space_announcement_subtitle">"Boas-vindas à versão beta dos Espaços! Com essa primeira versão, você pode:"</string>
-  <string name="screen_space_announcement_title">"Apresentando Espaços"</string>
-</resources>

features/announcement/impl/src/main/res/values-pt/translations.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item1">"Ver espaços que criaste ou nos quais entraste"</string>
-  <string name="screen_space_announcement_item2">"Aceitar ou recusar convites para espaços"</string>
-  <string name="screen_space_announcement_item3">"Descobrir todas as salas dos seus espaços nas quais podes entrar"</string>
-  <string name="screen_space_announcement_item4">"Entrar em espaços públicos"</string>
-  <string name="screen_space_announcement_item5">"Deixar todos os espaços em que entraste"</string>
-  <string name="screen_space_announcement_notice">"Em breve, será possível filtrar, criar e gerir espaços."</string>
-  <string name="screen_space_announcement_subtitle">"Eis a versão beta dos Espaços! Nesta primeira versão, podes:"</string>
-  <string name="screen_space_announcement_title">"Apresentamos os Espaços"</string>
-</resources>

features/announcement/impl/src/main/res/values-ro/translations.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item1">"Vizualizați spațiile pe care le-ați creat sau la care v-ați alăturat"</string>
-  <string name="screen_space_announcement_item2">"Acceptați sau refuzați invitațiile la spații"</string>
-  <string name="screen_space_announcement_item3">"Descoperiți toate camerele la care vă puteți alătura în spațiile dumneavoastră."</string>
-  <string name="screen_space_announcement_item4">"Alăturați-vă spațiilor publice"</string>
-  <string name="screen_space_announcement_item5">"Părăsiți spațiile la care v-ați alăturat."</string>
-  <string name="screen_space_announcement_notice">"Filtrarea, crearea și gestionarea spațiilor vor fi disponibile în curând."</string>
-  <string name="screen_space_announcement_subtitle">"Bun venit la versiunea beta a Spațiilor! Cu această primă versiune puteți:"</string>
-  <string name="screen_space_announcement_title">"Vă prezentăm Spații"</string>
-</resources>

features/announcement/impl/src/main/res/values-ru/translations.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item1">"Просматривать пространства, которые вы создали или к которым присоединились"</string>
-  <string name="screen_space_announcement_item2">"Принимать или отклонять приглашения в пространства"</string>
-  <string name="screen_space_announcement_item3">"Находить все комнаты, к которым можно присоединиться в ваших пространствах"</string>
-  <string name="screen_space_announcement_item4">"Присоединяться к публичным пространствам"</string>
-  <string name="screen_space_announcement_item5">"Покидать все пространства, к которым вы присоединились"</string>
-  <string name="screen_space_announcement_notice">"Фильтровать, создавать пространства и управлять ими можно будет позже."</string>
-  <string name="screen_space_announcement_subtitle">"Добро пожаловать в бета-версию пространств! Сейчас вы сможете:"</string>
-  <string name="screen_space_announcement_title">"Представляем пространства"</string>
-</resources>

features/announcement/impl/src/main/res/values-sk/translations.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item1">"Zobraziť priestory, ktoré ste vytvorili alebo ku ktorým ste sa pripojili"</string>
-  <string name="screen_space_announcement_item2">"Prijímať alebo odmietať pozvánky do priestorov"</string>
-  <string name="screen_space_announcement_item3">"Objaviť všetky miestnosti, do ktorých sa môžete pripojiť vo svojich priestoroch"</string>
-  <string name="screen_space_announcement_item4">"Pripojiť sa k verejnému priestoru"</string>
-  <string name="screen_space_announcement_item5">"Opustiť akékoľvek priestory, ku ktorým ste sa pridali"</string>
-  <string name="screen_space_announcement_notice">"Filtrovanie, vytváranie a správa priestorov bude čoskoro k dispozícii."</string>
-  <string name="screen_space_announcement_subtitle">"Vitajte v beta verzii priestorov! S touto prvou verziou môžete:"</string>
-  <string name="screen_space_announcement_title">"Predstavujeme priestory"</string>
-</resources>

features/announcement/impl/src/main/res/values-tr/translations.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item1">"Oluşturduğunuz veya katıldığınız alanları görüntüleyin"</string>
-  <string name="screen_space_announcement_item2">"Alan davetlerini kabul edin veya reddedin"</string>
-  <string name="screen_space_announcement_item3">"Alanlarınızdaki katılabileceğiniz odaları keşfedin"</string>
-  <string name="screen_space_announcement_item4">"Herkese açık alanlara katılın"</string>
-  <string name="screen_space_announcement_item5">"Katıldığınız alanlardan ayrılın"</string>
-  <string name="screen_space_announcement_notice">"Alanları filtreleme, oluşturma ve yönetme yakında geliyor."</string>
-  <string name="screen_space_announcement_subtitle">"Alanlar’ın beta sürümüne hoş geldiniz! Bu ilk sürümle şunları yapabilirsiniz:"</string>
-  <string name="screen_space_announcement_title">"Alanlar ile tanışın"</string>
-</resources>

features/announcement/impl/src/main/res/values-uk/translations.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item3">"Знаходьте у своїх просторах кімнати, до яких можна приєднатися"</string>
-  <string name="screen_space_announcement_notice">"Фільтрування, створення та керування просторами стане доступним найближчим часом."</string>
-  <string name="screen_space_announcement_subtitle">"Ласкаво просимо до бета-версії Просторів! У цій першій версії ви можете:"</string>
-  <string name="screen_space_announcement_title">"Представляємо Простори"</string>
-</resources>

features/announcement/impl/src/main/res/values-uz/translations.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item1">"Siz yaratgan yoki qo‘shilgan maydonlarni ko‘rish"</string>
-  <string name="screen_space_announcement_item2">"Maydonlarga takliflarni qabul qilish yoki rad etish"</string>
-  <string name="screen_space_announcement_item3">"Maydonlaringizga qo‘shilishingiz mumkin bo‘lgan xonalarni kashf eting"</string>
-  <string name="screen_space_announcement_item4">"Jamoat maydonlariga qo‘shilish"</string>
-  <string name="screen_space_announcement_item5">"Kirgan maydonlaringizni tark eting"</string>
-  <string name="screen_space_announcement_notice">"Maydonlarni filtrlash, yaratish va boshqarish tez orada amalga oshiriladi."</string>
-  <string name="screen_space_announcement_subtitle">"Maydonlar beta versiyasiga xush kelibsiz! Bu birinchi versiya bilan siz:"</string>
-  <string name="screen_space_announcement_title">"Maydonlar bilan tanishish"</string>
-</resources>

features/announcement/impl/src/main/res/values-zh-rTW/translations.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item1">"檢視您建立或加入的空間"</string>
-  <string name="screen_space_announcement_item2">"接受或拒絕空間邀請"</string>
-  <string name="screen_space_announcement_item3">"探索空間內您可以加入的任何聊天室"</string>
-  <string name="screen_space_announcement_item4">"加入公開空間"</string>
-  <string name="screen_space_announcement_item5">"離開任何您已加入的空間"</string>
-  <string name="screen_space_announcement_notice">"篩選、建立與管理空間功能即將推出。"</string>
-  <string name="screen_space_announcement_subtitle">"歡迎使用空間的測試版！此初始版本可讓您："</string>
-  <string name="screen_space_announcement_title">"介紹空間"</string>
-</resources>

features/announcement/impl/src/main/res/values-zh/translations.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item1">"查看您创建或加入的空间"</string>
-  <string name="screen_space_announcement_item2">"接受或拒绝空间邀请"</string>
-  <string name="screen_space_announcement_item3">"发现您可以加入空间的所有房间"</string>
-  <string name="screen_space_announcement_item4">"加入公共空间"</string>
-  <string name="screen_space_announcement_item5">"离开你加入的所有空间"</string>
-  <string name="screen_space_announcement_notice">"筛选、创建及管理空间功能即将上线。"</string>
-  <string name="screen_space_announcement_subtitle">"欢迎使用 Spaces 测试版！使用首个版本，您可以："</string>
-  <string name="screen_space_announcement_title">"Spaces 简介"</string>
-</resources>

features/announcement/impl/src/main/res/values/localazy.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item1">"View spaces you\'ve created or joined"</string>
-  <string name="screen_space_announcement_item2">"Accept or decline invites to spaces"</string>
-  <string name="screen_space_announcement_item3">"Discover any rooms you can join in your spaces"</string>
-  <string name="screen_space_announcement_item4">"Join public spaces"</string>
-  <string name="screen_space_announcement_item5">"Leave any spaces you’ve joined"</string>
-  <string name="screen_space_announcement_notice">"Filtering, creating and managing spaces is coming soon."</string>
-  <string name="screen_space_announcement_subtitle">"Welcome to the beta version of Spaces! With this first version you can:"</string>
-  <string name="screen_space_announcement_title">"Introducing Spaces"</string>
-</resources>

features/announcement/impl/src/test/kotlin/io/element/android/features/announcement/impl/AnnouncementPresenterTest.kt

@@ -14,6 +14,7 @@ import io.element.android.features.announcement.impl.store.AnnouncementStatus
 import io.element.android.features.announcement.impl.store.AnnouncementStore
 import io.element.android.features.announcement.impl.store.InMemoryAnnouncementStore
 import io.element.android.tests.testutils.test
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 
@@ -23,25 +24,47 @@ class AnnouncementPresenterTest {
         val presenter = createAnnouncementPresenter()
         presenter.test {
             val state = awaitItem()
-            assertThat(state.showSpaceAnnouncement).isFalse()
+            assertThat(state.announcement).isNull()
         }
     }
 
     @Test
-    fun `present - showSpaceAnnouncement value depends on the value in the store`() = runTest {
+    fun `present - showFullscreen value depends on the value in the store`() = runTest {
         val store = InMemoryAnnouncementStore()
         val presenter = createAnnouncementPresenter(
             announcementStore = store,
         )
         presenter.test {
             val state = awaitItem()
-            assertThat(state.showSpaceAnnouncement).isFalse()
-            store.setAnnouncementStatus(Announcement.Space, AnnouncementStatus.Show)
+            assertThat(state.announcement).isNull()
+            store.setAnnouncementStatus(Announcement.Fullscreen.Space, AnnouncementStatus.Show)
             val updatedState = awaitItem()
-            assertThat(updatedState.showSpaceAnnouncement).isTrue()
-            store.setAnnouncementStatus(Announcement.Space, AnnouncementStatus.Shown)
+            assertThat(updatedState.announcement).isEqualTo(Announcement.Fullscreen.Space)
+            store.setAnnouncementStatus(Announcement.Fullscreen.Space, AnnouncementStatus.Shown)
             val finalState = awaitItem()
-            assertThat(finalState.showSpaceAnnouncement).isFalse()
+            assertThat(finalState.announcement).isNull()
+        }
+    }
+
+    @Test
+    fun `present - continue event will mark the announcement as Shown`() = runTest {
+        val store = InMemoryAnnouncementStore()
+        val presenter = createAnnouncementPresenter(
+            announcementStore = store,
+        )
+        presenter.test {
+            val state = awaitItem()
+            assertThat(state.announcement).isNull()
+            store.setAnnouncementStatus(Announcement.Fullscreen.Space, AnnouncementStatus.Show)
+            val statusShow = store.announcementStatusFlow(Announcement.Fullscreen.Space).first()
+            assertThat(statusShow).isEqualTo(AnnouncementStatus.Show)
+            val updatedState = awaitItem()
+            assertThat(updatedState.announcement).isEqualTo(Announcement.Fullscreen.Space)
+            updatedState.eventSink(AnnouncementEvent.Continue(Announcement.Fullscreen.Space))
+            val statusShown = store.announcementStatusFlow(Announcement.Fullscreen.Space).first()
+            assertThat(statusShown).isEqualTo(AnnouncementStatus.Shown)
+            val finalState = awaitItem()
+            assertThat(finalState.announcement).isNull()
         }
     }
 }

features/announcement/impl/src/test/kotlin/io/element/android/features/announcement/impl/DefaultAnnouncementServiceTest.kt

@@ -11,31 +11,28 @@ package io.element.android.features.announcement.impl
 import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
 import io.element.android.features.announcement.api.Announcement
-import io.element.android.features.announcement.impl.spaces.SpaceAnnouncementState
-import io.element.android.features.announcement.impl.spaces.aSpaceAnnouncementState
 import io.element.android.features.announcement.impl.store.AnnouncementStatus
 import io.element.android.features.announcement.impl.store.AnnouncementStore
 import io.element.android.features.announcement.impl.store.InMemoryAnnouncementStore
-import io.element.android.libraries.architecture.Presenter
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 
 class DefaultAnnouncementServiceTest {
     @Test
-    fun `when showing Space announcement, space announcement is set to show only if it was never shown`() = runTest {
+    fun `when showing Fullscreen announcement, Fullscreen announcement is set to show only if it was never shown`() = runTest {
         val announcementStore = InMemoryAnnouncementStore()
         val sut = createDefaultAnnouncementService(
             announcementStore = announcementStore,
         )
-        assertThat(announcementStore.announcementStatusFlow(Announcement.Space).first()).isEqualTo(AnnouncementStatus.NeverShown)
-        sut.showAnnouncement(Announcement.Space)
-        assertThat(announcementStore.announcementStatusFlow(Announcement.Space).first()).isEqualTo(AnnouncementStatus.Show)
+        assertThat(announcementStore.announcementStatusFlow(Announcement.Fullscreen.Space).first()).isEqualTo(AnnouncementStatus.NeverShown)
+        sut.showAnnouncement(Announcement.Fullscreen.Space)
+        assertThat(announcementStore.announcementStatusFlow(Announcement.Fullscreen.Space).first()).isEqualTo(AnnouncementStatus.Show)
         // Simulate user close the announcement
-        sut.onAnnouncementDismissed(Announcement.Space)
+        sut.onAnnouncementDismissed(Announcement.Fullscreen.Space)
         // Entering again the space tab should not change the value
-        sut.showAnnouncement(Announcement.Space)
-        assertThat(announcementStore.announcementStatusFlow(Announcement.Space).first()).isEqualTo(AnnouncementStatus.Shown)
+        sut.showAnnouncement(Announcement.Fullscreen.Space)
+        assertThat(announcementStore.announcementStatusFlow(Announcement.Fullscreen.Space).first()).isEqualTo(AnnouncementStatus.Shown)
     }
 
     @Test
@@ -62,11 +59,7 @@ class DefaultAnnouncementServiceTest {
         )
         sut.announcementsToShowFlow().test {
             assertThat(awaitItem()).isEmpty()
-            announcementStore.setAnnouncementStatus(Announcement.Space, AnnouncementStatus.Show)
-            assertThat(awaitItem()).containsExactly(Announcement.Space)
             announcementStore.setAnnouncementStatus(Announcement.NewNotificationSound, AnnouncementStatus.Show)
-            assertThat(awaitItem()).containsExactly(Announcement.Space, Announcement.NewNotificationSound)
-            announcementStore.setAnnouncementStatus(Announcement.Space, AnnouncementStatus.Shown)
             assertThat(awaitItem()).containsExactly(Announcement.NewNotificationSound)
             announcementStore.setAnnouncementStatus(Announcement.NewNotificationSound, AnnouncementStatus.Shown)
             assertThat(awaitItem()).isEmpty()
@@ -75,11 +68,9 @@ class DefaultAnnouncementServiceTest {
 
     private fun createDefaultAnnouncementService(
         announcementStore: AnnouncementStore = InMemoryAnnouncementStore(),
-        announcementPresenter: Presenter<AnnouncementState> = Presenter { anAnnouncementState() },
-        spaceAnnouncementPresenter: Presenter<SpaceAnnouncementState> = Presenter { aSpaceAnnouncementState() },
+        announcementPresenter: AnnouncementPresenter = AnnouncementPresenter(announcementStore),
     ) = DefaultAnnouncementService(
         announcementStore = announcementStore,
         announcementPresenter = announcementPresenter,
-        spaceAnnouncementPresenter = spaceAnnouncementPresenter,
     )
 }

features/announcement/impl/src/test/kotlin/io/element/android/features/announcement/impl/fullscreen/FullscreenAnnouncementViewTest.kt

@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+@file:OptIn(ExperimentalTestApi::class)
+
+package io.element.android.features.announcement.impl.fullscreen
+
+import androidx.activity.ComponentActivity
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
+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.anAnnouncementState
+import io.element.android.libraries.ui.strings.CommonStrings
+import io.element.android.tests.testutils.EventsRecorder
+import io.element.android.tests.testutils.clickOn
+import io.element.android.tests.testutils.pressBackKey
+import io.element.android.tests.testutils.robolectric.RobolectricTest
+import org.junit.Test
+
+class FullscreenAnnouncementViewTest : RobolectricTest() {
+    @Test
+    fun `clicking on back sends a AnnouncementEvent`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<AnnouncementEvent>()
+        setFullscreenAnnouncementView(
+            anAnnouncementState(
+                announcement = Announcement.Fullscreen.Space,
+                eventSink = eventsRecorder,
+            ),
+        )
+        pressBackKey()
+        eventsRecorder.assertSingle(AnnouncementEvent.Continue(Announcement.Fullscreen.Space))
+    }
+
+    @Test
+    fun `clicking on Continue sends a AnnouncementEvent`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<AnnouncementEvent>()
+        setFullscreenAnnouncementView(
+            anAnnouncementState(
+                announcement = Announcement.Fullscreen.Space,
+                eventSink = eventsRecorder,
+            ),
+        )
+        clickOn(CommonStrings.action_continue)
+        eventsRecorder.assertSingle(AnnouncementEvent.Continue(Announcement.Fullscreen.Space))
+    }
+}
+
+private fun AndroidComposeUiTest<ComponentActivity>.setFullscreenAnnouncementView(
+    state: AnnouncementState,
+) {
+    setContent {
+        FullscreenAnnouncementView(
+            state = state,
+        )
+    }
+}

features/announcement/impl/src/test/kotlin/io/element/android/features/announcement/impl/spaces/SpaceAnnouncementPresenterTest.kt

@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2025 New Vector 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.announcement.impl.spaces
-
-import com.google.common.truth.Truth.assertThat
-import io.element.android.features.announcement.api.Announcement
-import io.element.android.features.announcement.impl.store.AnnouncementStatus
-import io.element.android.features.announcement.impl.store.AnnouncementStore
-import io.element.android.features.announcement.impl.store.InMemoryAnnouncementStore
-import io.element.android.tests.testutils.test
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.test.runTest
-import org.junit.Test
-
-class SpaceAnnouncementPresenterTest {
-    @Test
-    fun `present - when user continues, the store is updated`() = runTest {
-        val store = InMemoryAnnouncementStore()
-        val presenter = createSpaceAnnouncementPresenter(
-            announcementStore = store,
-        )
-        presenter.test {
-            assertThat(store.announcementStatusFlow(Announcement.Space).first()).isEqualTo(AnnouncementStatus.NeverShown)
-            val state = awaitItem()
-            state.eventSink(SpaceAnnouncementEvents.Continue)
-            assertThat(store.announcementStatusFlow(Announcement.Space).first()).isEqualTo(AnnouncementStatus.Shown)
-        }
-    }
-}
-
-private fun createSpaceAnnouncementPresenter(
-    announcementStore: AnnouncementStore = InMemoryAnnouncementStore(),
-) = SpaceAnnouncementPresenter(
-    announcementStore = announcementStore,
-)

features/announcement/impl/src/test/kotlin/io/element/android/features/announcement/impl/spaces/SpaceAnnouncementViewTest.kt

@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2025 New Vector 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.announcement.impl.spaces
-
-import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import io.element.android.libraries.ui.strings.CommonStrings
-import io.element.android.tests.testutils.EventsRecorder
-import io.element.android.tests.testutils.clickOn
-import io.element.android.tests.testutils.pressBackKey
-import org.junit.Rule
-import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class SpaceAnnouncementViewTest {
-    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
-
-    @Test
-    fun `clicking on back sends a SpaceAnnouncementEvents`() {
-        val eventsRecorder = EventsRecorder<SpaceAnnouncementEvents>()
-        rule.setSpaceAnnouncementView(
-            aSpaceAnnouncementState(
-                eventSink = eventsRecorder,
-            ),
-        )
-        rule.pressBackKey()
-        eventsRecorder.assertSingle(SpaceAnnouncementEvents.Continue)
-    }
-
-    @Test
-    fun `clicking on Continue sends a SpaceAnnouncementEvents`() {
-        val eventsRecorder = EventsRecorder<SpaceAnnouncementEvents>()
-        rule.setSpaceAnnouncementView(
-            aSpaceAnnouncementState(
-                eventSink = eventsRecorder,
-            ),
-        )
-        rule.clickOn(CommonStrings.action_continue)
-        eventsRecorder.assertSingle(SpaceAnnouncementEvents.Continue)
-    }
-}
-
-private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setSpaceAnnouncementView(
-    state: SpaceAnnouncementState,
-) {
-    setContent {
-        SpaceAnnouncementView(
-            state = state,
-        )
-    }
-}

features/announcement/impl/src/test/kotlin/io/element/android/features/announcement/impl/store/InMemoryAnnouncementStore.kt

@@ -14,10 +14,10 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 
 class InMemoryAnnouncementStore(
-    initialSpaceAnnouncementStatus: AnnouncementStatus = AnnouncementStatus.NeverShown,
+    initialFullscreenAnnouncementStatus: AnnouncementStatus = AnnouncementStatus.NeverShown,
     initialNewNotificationSoundAnnouncementStatus: AnnouncementStatus = AnnouncementStatus.NeverShown,
 ) : AnnouncementStore {
-    private val spaceAnnouncement = MutableStateFlow(initialSpaceAnnouncementStatus)
+    private val fullScreenAnnouncement = MutableStateFlow(initialFullscreenAnnouncementStatus)
     private val newNotificationSoundAnnouncement = MutableStateFlow(initialNewNotificationSoundAnnouncementStatus)
 
     override suspend fun setAnnouncementStatus(announcement: Announcement, status: AnnouncementStatus) {
@@ -29,12 +29,12 @@ class InMemoryAnnouncementStore(
     }
 
     override suspend fun reset() {
-        spaceAnnouncement.value = AnnouncementStatus.NeverShown
+        fullScreenAnnouncement.value = AnnouncementStatus.NeverShown
         newNotificationSoundAnnouncement.value = AnnouncementStatus.NeverShown
     }
 
     private fun Announcement.toMutableStateFlow() = when (this) {
-        Announcement.Space -> spaceAnnouncement
+        is Announcement.Fullscreen -> fullScreenAnnouncement
         Announcement.NewNotificationSound -> newNotificationSoundAnnouncement
     }
 }

features/call/api/src/main/kotlin/io/element/android/features/call/api/CallData.kt

@@ -14,22 +14,9 @@ import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.SessionId
 import kotlinx.parcelize.Parcelize
 
-sealed interface CallType : NodeInputs, Parcelable {
-    @Parcelize
-    data class ExternalUrl(val url: String) : CallType {
-        override fun toString(): String {
-            return "ExternalUrl"
-        }
-    }
-
-    @Parcelize
-    data class RoomCall(
-        val sessionId: SessionId,
-        val roomId: RoomId,
-        val isAudioCall: Boolean
-    ) : CallType {
-        override fun toString(): String {
-            return "RoomCall(sessionId=$sessionId, roomId=$roomId, isAudioCall=$isAudioCall)"
-        }
-    }
-}
+@Parcelize
+data class CallData(
+    val sessionId: SessionId,
+    val roomId: RoomId,
+    val isAudioCall: Boolean
+) : NodeInputs, Parcelable

features/call/api/src/main/kotlin/io/element/android/features/call/api/ElementCallEntryPoint.kt

@@ -17,13 +17,13 @@ import io.element.android.libraries.matrix.api.core.UserId
 interface ElementCallEntryPoint {
     /**
      * Start a call of the given type.
-     * @param callType The type of call to start.
+     * @param callData The data of call to start.
      */
-    fun startCall(callType: CallType)
+    fun startCall(callData: CallData)
 
     /**
      * Handle an incoming call.
-     * @param callType The type of call.
+     * @param callData The data of call.
      * @param eventId The event id of the event that started the call.
      * @param senderId The user id of the sender of the event that started the call.
      * @param roomName The name of the room the call is in.
@@ -35,7 +35,7 @@ interface ElementCallEntryPoint {
      * @param textContent The text content of the notification. If null the default content from the system will be used.
      */
     suspend fun handleIncomingCall(
-        callType: CallType.RoomCall,
+        callData: CallData,
         eventId: EventId,
         senderId: UserId,
         roomName: String?,

features/call/impl/build.gradle.kts

@@ -73,7 +73,7 @@ dependencies {
     implementation(projects.libraries.core)
     implementation(projects.libraries.designsystem)
     implementation(projects.libraries.featureflag.api)
-    implementation(projects.libraries.matrix.impl)
+    implementation(projects.libraries.matrix.api)
     implementation(projects.libraries.matrixmedia.api)
     implementation(projects.libraries.network)
     implementation(projects.libraries.preferences.api)
@@ -84,7 +84,6 @@ dependencies {
     implementation(projects.services.toolbox.api)
     implementation(libs.androidx.webkit)
     implementation(libs.coil.compose)
-    implementation(libs.network.retrofit)
     implementation(libs.serialization.json)
     implementation(libs.element.call.embedded)
     api(projects.features.call.api)

features/call/impl/src/main/AndroidManifest.xml

@@ -14,6 +14,7 @@
         android:name="android.hardware.microphone"
         android:required="false" />
 
+    <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.CAMERA" />
@@ -30,44 +31,10 @@
         <activity
             android:name=".ui.ElementCallActivity"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation|keyboardHidden|keyboard|navigation|uiMode"
-            android:exported="true"
             android:label="@string/element_call"
             android:launchMode="singleTask"
             android:supportsPictureInPicture="true"
-            android:taskAffinity="io.element.android.features.call">
-
-            <intent-filter android:autoVerify="true">
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="https" />
-
-                <!-- Matching asset file: https://call.element.io/.well-known/assetlinks.json -->
-                <data android:host="call.element.io" />
-            </intent-filter>
-            <!-- Custom scheme to handle urls from other domains in the format: element://call?url=https%3A%2F%2Felement.io -->
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="element" />
-                <data android:host="call" />
-            </intent-filter>
-            <!-- Custom scheme to handle urls from other domains in the format: io.element.call:/?url=https%3A%2F%2Felement.io -->
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="io.element.call" />
-            </intent-filter>
-
-        </activity>
+            android:taskAffinity="io.element.android.features.call" />
 
         <activity
             android:name=".ui.IncomingCallActivity"

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

@@ -11,7 +11,7 @@ package io.element.android.features.call.impl
 import android.content.Context
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import io.element.android.features.call.api.CallType
+import io.element.android.features.call.api.CallData
 import io.element.android.features.call.api.ElementCallEntryPoint
 import io.element.android.features.call.impl.notifications.CallNotificationData
 import io.element.android.features.call.impl.utils.ActiveCallManager
@@ -30,12 +30,12 @@ class DefaultElementCallEntryPoint(
         const val REQUEST_CODE = 2255
     }
 
-    override fun startCall(callType: CallType) {
-        context.startActivity(IntentProvider.createIntent(context, callType))
+    override fun startCall(callData: CallData) {
+        context.startActivity(IntentProvider.createIntent(context, callData))
     }
 
     override suspend fun handleIncomingCall(
-        callType: CallType.RoomCall,
+        callData: CallData,
         eventId: EventId,
         senderId: UserId,
         roomName: String?,
@@ -47,8 +47,8 @@ class DefaultElementCallEntryPoint(
         textContent: String?,
     ) {
         val incomingCallNotificationData = CallNotificationData(
-            sessionId = callType.sessionId,
-            roomId = callType.roomId,
+            sessionId = callData.sessionId,
+            roomId = callData.roomId,
             eventId = eventId,
             senderId = senderId,
             roomName = roomName,
@@ -58,7 +58,7 @@ class DefaultElementCallEntryPoint(
             expirationTimestamp = expirationTimestamp,
             notificationChannelId = notificationChannelId,
             textContent = textContent,
-            audioOnly = callType.isAudioCall
+            audioOnly = callData.isAudioCall,
         )
         activeCallManager.registerIncomingCall(notificationData = incomingCallNotificationData)
     }

features/call/impl/src/main/kotlin/io/element/android/features/call/impl/notifications/RingingCallNotificationCreator.kt

@@ -18,7 +18,7 @@ import androidx.core.app.PendingIntentCompat
 import androidx.core.app.Person
 import dev.zacsweers.metro.Inject
 import io.element.android.appconfig.ElementCallConfig
-import io.element.android.features.call.api.CallType
+import io.element.android.features.call.api.CallData
 import io.element.android.features.call.impl.receivers.DeclineCallBroadcastReceiver
 import io.element.android.features.call.impl.ui.IncomingCallActivity
 import io.element.android.features.call.impl.utils.IntentProvider
@@ -89,7 +89,14 @@ class RingingCallNotificationCreator(
             .setImportant(true)
             .build()
 
-        val answerIntent = IntentProvider.getPendingIntent(context, CallType.RoomCall(sessionId, roomId, isAudioCall = audioOnly))
+        val answerIntent = IntentProvider.getPendingIntent(
+            context,
+            CallData(
+                sessionId = sessionId,
+                roomId = roomId,
+                isAudioCall = audioOnly,
+            ),
+        )
         val notificationData = CallNotificationData(
             sessionId = sessionId,
             roomId = roomId,

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

@@ -10,8 +10,8 @@ package io.element.android.features.call.impl.pip
 
 import io.element.android.features.call.impl.utils.PipController
 
-sealed interface PictureInPictureEvents {
-    data class SetPipController(val pipController: PipController) : PictureInPictureEvents
-    data object EnterPictureInPicture : PictureInPictureEvents
-    data class OnPictureInPictureModeChanged(val isInPip: Boolean) : PictureInPictureEvents
+sealed interface PictureInPictureEvent {
+    data class SetPipController(val pipController: PipController) : PictureInPictureEvent
+    data object EnterPictureInPicture : PictureInPictureEvent
+    data class OnPictureInPictureModeChanged(val isInPip: Boolean) : PictureInPictureEvent
 }

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

@@ -36,17 +36,17 @@ class PictureInPicturePresenter(
         var isInPictureInPicture by remember { mutableStateOf(false) }
         var pipController by remember { mutableStateOf<PipController?>(null) }
 
-        fun handleEvent(event: PictureInPictureEvents) {
+        fun handleEvent(event: PictureInPictureEvent) {
             when (event) {
-                is PictureInPictureEvents.SetPipController -> {
+                is PictureInPictureEvent.SetPipController -> {
                     pipController = event.pipController
                 }
-                PictureInPictureEvents.EnterPictureInPicture -> {
+                PictureInPictureEvent.EnterPictureInPicture -> {
                     coroutineScope.launch {
                         switchToPip(pipController)
                     }
                 }
-                is PictureInPictureEvents.OnPictureInPictureModeChanged -> {
+                is PictureInPictureEvent.OnPictureInPictureModeChanged -> {
                     Timber.tag(loggerTag.value).d("onPictureInPictureModeChanged: ${event.isInPip}")
                     isInPictureInPicture = event.isInPip
                     if (event.isInPip) {

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

@@ -11,5 +11,5 @@ package io.element.android.features.call.impl.pip
 data class PictureInPictureState(
     val supportPip: Boolean,
     val isInPictureInPicture: Boolean,
-    val eventSink: (PictureInPictureEvents) -> Unit,
+    val eventSink: (PictureInPictureEvent) -> Unit,
 )

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

@@ -11,7 +11,7 @@ package io.element.android.features.call.impl.pip
 fun aPictureInPictureState(
     supportPip: Boolean = false,
     isInPictureInPicture: Boolean = false,
-    eventSink: (PictureInPictureEvents) -> Unit = {},
+    eventSink: (PictureInPictureEvent) -> Unit = {},
 ): PictureInPictureState {
     return PictureInPictureState(
         supportPip = supportPip,

features/call/impl/src/main/kotlin/io/element/android/features/call/impl/receivers/DeclineCallBroadcastReceiver.kt

@@ -13,7 +13,7 @@ import android.content.Context
 import android.content.Intent
 import androidx.core.content.IntentCompat
 import dev.zacsweers.metro.Inject
-import io.element.android.features.call.api.CallType
+import io.element.android.features.call.api.CallData
 import io.element.android.features.call.impl.di.CallBindings
 import io.element.android.features.call.impl.notifications.CallNotificationData
 import io.element.android.features.call.impl.utils.ActiveCallManager
@@ -42,7 +42,7 @@ class DeclineCallBroadcastReceiver : BroadcastReceiver() {
         context.bindings<CallBindings>().inject(this)
         appCoroutineScope.launch {
             activeCallManager.hangUpCall(
-                callType = CallType.RoomCall(
+                callData = CallData(
                     sessionId = notificationData.sessionId,
                     roomId = notificationData.roomId,
                     isAudioCall = notificationData.audioOnly

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

@@ -9,6 +9,8 @@ package io.element.android.features.call.impl.ui
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.features.call.impl.notifications.CallNotificationData
+import io.element.android.libraries.designsystem.preview.ROOM_NAME
+import io.element.android.libraries.designsystem.preview.USER_NAME_BOB
 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.SessionId
@@ -34,8 +36,8 @@ internal fun aCallNotificationData(
         roomId = RoomId("!1234:matrix.org"),
         eventId = EventId("\$asdadadsad:matrix.org"),
         senderId = UserId("@bob:matrix.org"),
-        roomName = "A room",
-        senderName = "Bob",
+        roomName = ROOM_NAME,
+        senderName = USER_NAME_BOB,
         avatarUrl = null,
         notificationChannelId = "incoming_call",
         timestamp = 0L,

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

@@ -0,0 +1,26 @@
+/*
+ * 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.call.impl.ui
+internal sealed interface CallScreenBackPressAction {
+    data object DispatchEscapeToWebView : CallScreenBackPressAction
+    data object EnterPictureInPicture : CallScreenBackPressAction
+}
+
+internal object CallScreenBackPressPolicy {
+    fun resolve(
+        supportPip: Boolean,
+        hasWebView: Boolean,
+        fromNative: Boolean,
+    ): CallScreenBackPressAction? {
+        return when {
+            hasWebView && fromNative -> CallScreenBackPressAction.DispatchEscapeToWebView
+            hasWebView && supportPip -> CallScreenBackPressAction.EnterPictureInPicture
+            else -> null
+        }
+    }
+}

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

@@ -10,8 +10,8 @@ package io.element.android.features.call.impl.ui
 
 import io.element.android.features.call.impl.utils.WidgetMessageInterceptor
 
-sealed interface CallScreenEvents {
-    data object Hangup : CallScreenEvents
-    data class SetupMessageChannels(val widgetMessageInterceptor: WidgetMessageInterceptor) : CallScreenEvents
-    data class OnWebViewError(val description: String?) : CallScreenEvents
+sealed interface CallScreenEvent {
+    data object Hangup : CallScreenEvent
+    data class SetupMessageChannels(val widgetMessageInterceptor: WidgetMessageInterceptor) : CallScreenEvent
+    data class OnWebViewError(val description: String?) : CallScreenEvent
 }

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

@@ -22,8 +22,7 @@ import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedFactory
 import dev.zacsweers.metro.AssistedInject
 import im.vector.app.features.analytics.plan.MobileScreen
-import io.element.android.compound.theme.ElementTheme
-import io.element.android.features.call.api.CallType
+import io.element.android.features.call.api.CallData
 import io.element.android.features.call.impl.data.WidgetMessage
 import io.element.android.features.call.impl.utils.ActiveCallManager
 import io.element.android.features.call.impl.utils.CallWidgetProvider
@@ -52,7 +51,7 @@ import kotlin.time.Duration.Companion.seconds
 
 @AssistedInject
 class CallScreenPresenter(
-    @Assisted private val callType: CallType,
+    @Assisted private val callData: CallData,
     @Assisted private val navigator: CallScreenNavigator,
     private val callWidgetProvider: CallWidgetProvider,
     userAgentProvider: UserAgentProvider,
@@ -69,10 +68,9 @@ class CallScreenPresenter(
 ) : Presenter<CallScreenState> {
     @AssistedFactory
     interface Factory {
-        fun create(callType: CallType, navigator: CallScreenNavigator): CallScreenPresenter
+        fun create(callData: CallData, navigator: CallScreenNavigator): CallScreenPresenter
     }
 
-    private val isInWidgetMode = callType is CallType.RoomCall
     private val userAgent = userAgentProvider.provide()
 
     @Composable
@@ -85,14 +83,14 @@ class CallScreenPresenter(
         var ignoreWebViewError by rememberSaveable { mutableStateOf(false) }
         var webViewError by remember { mutableStateOf<String?>(null) }
         val languageTag = languageTagProvider.provideLanguageTag()
-        val theme = if (ElementTheme.isLightTheme) "light" else "dark"
+        val theme = "dark"
 
         DisposableEffect(Unit) {
             coroutineScope.launch {
                 // Sets the call as joined
-                activeCallManager.joinedCall(callType)
+                activeCallManager.joinedCall(callData)
                 fetchRoomCallUrl(
-                    inputs = callType,
+                    callData = callData,
                     urlState = urlState,
                     callWidgetDriver = callWidgetDriver,
                     languageTag = languageTag,
@@ -100,19 +98,10 @@ class CallScreenPresenter(
                 )
             }
             onDispose {
-                appCoroutineScope.launch { activeCallManager.hangUpCall(callType) }
+                appCoroutineScope.launch { activeCallManager.hangUpCall(callData) }
             }
         }
-
-        when (callType) {
-            is CallType.ExternalUrl -> {
-                // No analytics yet for external calls
-            }
-            is CallType.RoomCall -> {
-                screenTracker.TrackScreen(screen = MobileScreen.ScreenName.RoomCall)
-            }
-        }
-
+        screenTracker.TrackScreen(screen = MobileScreen.ScreenName.RoomCall)
         HandleMatrixClientSyncState()
 
         callWidgetDriver.value?.let { driver ->
@@ -149,25 +138,22 @@ class CallScreenPresenter(
                     .launchIn(this)
             }
 
-            if (callType is CallType.RoomCall) {
-                // Note: For external calls isWidgetLoaded will always be false
-                LaunchedEffect(Unit) {
-                    // Wait for the call to be joined, if it takes too long, we display an error
-                    delay(10.seconds)
+            LaunchedEffect(Unit) {
+                // Wait for the call to be joined, if it takes too long, we display an error
+                delay(10.seconds)
 
-                    if (!isWidgetLoaded) {
-                        Timber.w("The call took too long to load. Displaying an error before exiting.")
+                if (!isWidgetLoaded) {
+                    Timber.w("The call took too long to load. Displaying an error before exiting.")
 
-                        // This will display a simple 'Sorry, an error occurred' dialog and force the user to exit the call
-                        webViewError = ""
-                    }
+                    // This will display a simple 'Sorry, an error occurred' dialog and force the user to exit the call
+                    webViewError = ""
                 }
             }
         }
 
-        fun handleEvent(event: CallScreenEvents) {
+        fun handleEvent(event: CallScreenEvent) {
             when (event) {
-                is CallScreenEvents.Hangup -> {
+                is CallScreenEvent.Hangup -> {
                     val widgetId = callWidgetDriver.value?.id
                     val interceptor = messageInterceptor.value
                     if (widgetId != null && interceptor != null && isWidgetLoaded) {
@@ -187,10 +173,10 @@ class CallScreenPresenter(
                         }
                     }
                 }
-                is CallScreenEvents.SetupMessageChannels -> {
+                is CallScreenEvent.SetupMessageChannels -> {
                     messageInterceptor.value = event.widgetMessageInterceptor
                 }
-                is CallScreenEvents.OnWebViewError -> {
+                is CallScreenEvent.OnWebViewError -> {
                     if (!ignoreWebViewError) {
                         webViewError = event.description.orEmpty()
                     }
@@ -204,37 +190,29 @@ class CallScreenPresenter(
             webViewError = webViewError,
             userAgent = userAgent,
             isCallActive = isWidgetLoaded,
-            isInWidgetMode = isInWidgetMode,
             eventSink = ::handleEvent,
         )
     }
 
     private suspend fun fetchRoomCallUrl(
-        inputs: CallType,
+        callData: CallData,
         urlState: MutableState<AsyncData<String>>,
         callWidgetDriver: MutableState<MatrixWidgetDriver?>,
         languageTag: String?,
         theme: String?,
     ) {
         urlState.runCatchingUpdatingState {
-            when (inputs) {
-                is CallType.ExternalUrl -> {
-                    inputs.url
-                }
-                is CallType.RoomCall -> {
-                    val result = callWidgetProvider.getWidget(
-                        sessionId = inputs.sessionId,
-                        roomId = inputs.roomId,
-                        clientId = UUID.randomUUID().toString(),
-                        isAudioCall = inputs.isAudioCall,
-                        languageTag = languageTag,
-                        theme = theme,
-                    ).getOrThrow()
-                    callWidgetDriver.value = result.driver
-                    Timber.d("Call widget driver initialized for sessionId: ${inputs.sessionId}, roomId: ${inputs.roomId}")
-                    result.url
-                }
-            }
+            val result = callWidgetProvider.getWidget(
+                sessionId = callData.sessionId,
+                roomId = callData.roomId,
+                clientId = UUID.randomUUID().toString(),
+                isAudioCall = callData.isAudioCall,
+                languageTag = languageTag,
+                theme = theme,
+            ).getOrThrow()
+            callWidgetDriver.value = result.driver
+            Timber.d("Call widget driver initialized for sessionId: ${callData.sessionId}, roomId: ${callData.roomId}")
+            result.url
         }
     }
 
@@ -242,12 +220,11 @@ class CallScreenPresenter(
     private fun HandleMatrixClientSyncState() {
         val coroutineScope = rememberCoroutineScope()
         DisposableEffect(Unit) {
-            val roomCallType = callType as? CallType.RoomCall ?: return@DisposableEffect onDispose {}
-            val client = matrixClientsProvider.getOrNull(roomCallType.sessionId) ?: return@DisposableEffect onDispose {
-                Timber.w("No MatrixClient found for sessionId, can't send call notification: ${roomCallType.sessionId}")
+            val client = matrixClientsProvider.getOrNull(callData.sessionId) ?: return@DisposableEffect onDispose {
+                Timber.w("No MatrixClient found for sessionId, can't send call notification: ${callData.sessionId}")
             }
             coroutineScope.launch {
-                Timber.d("Observing sync state in-call for sessionId: ${roomCallType.sessionId}")
+                Timber.d("Observing sync state in-call for sessionId: ${callData.sessionId}")
                 client.syncService.syncState
                     .collect { state ->
                         if (state != SyncState.Running) {
@@ -256,7 +233,7 @@ class CallScreenPresenter(
                     }
             }
             onDispose {
-                Timber.d("Stopped observing sync state in-call for sessionId: ${roomCallType.sessionId}")
+                Timber.d("Stopped observing sync state in-call for sessionId: ${callData.sessionId}")
                 // Make sure we mark the call as ended in the app state
                 appForegroundStateService.updateIsInCallState(false)
             }

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

@@ -15,6 +15,5 @@ data class CallScreenState(
     val webViewError: String?,
     val userAgent: String,
     val isCallActive: Boolean,
-    val isInWidgetMode: Boolean,
-    val eventSink: (CallScreenEvents) -> Unit,
+    val eventSink: (CallScreenEvent) -> Unit,
 )

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

@@ -26,15 +26,13 @@ internal fun aCallScreenState(
     webViewError: String? = null,
     userAgent: String = "",
     isCallActive: Boolean = true,
-    isInWidgetMode: Boolean = false,
-    eventSink: (CallScreenEvents) -> Unit = {},
+    eventSink: (CallScreenEvent) -> Unit = {},
 ): CallScreenState {
     return CallScreenState(
         urlState = urlState,
         webViewError = webViewError,
         userAgent = userAgent,
         isCallActive = isCallActive,
-        isInWidgetMode = isInWidgetMode,
         eventSink = eventSink,
     )
 }

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

@@ -17,9 +17,10 @@ import android.webkit.WebChromeClient
 import android.webkit.WebView
 import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.systemBars
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -33,7 +34,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.viewinterop.AndroidView
 import io.element.android.features.call.impl.R
-import io.element.android.features.call.impl.pip.PictureInPictureEvents
+import io.element.android.features.call.impl.pip.PictureInPictureEvent
 import io.element.android.features.call.impl.pip.PictureInPictureState
 import io.element.android.features.call.impl.pip.aPictureInPictureState
 import io.element.android.features.call.impl.utils.InvalidAudioDeviceReason
@@ -45,7 +46,6 @@ import io.element.android.libraries.designsystem.components.ProgressDialog
 import io.element.android.libraries.designsystem.components.dialogs.ErrorDialog
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
-import io.element.android.libraries.designsystem.theme.components.Scaffold
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.ui.strings.CommonStrings
 import timber.log.Timber
@@ -64,94 +64,93 @@ internal fun CallScreenView(
     requestPermissions: (Array<String>, RequestPermissionCallback) -> Unit,
     modifier: Modifier = Modifier,
 ) {
-    fun handleBack() {
-        if (pipState.supportPip) {
-            pipState.eventSink.invoke(PictureInPictureEvents.EnterPictureInPicture)
-        } else {
-            state.eventSink(CallScreenEvents.Hangup)
+    var callWebView by remember { mutableStateOf<WebView?>(null) }
+
+    fun handleBack(fromNative: Boolean = false) {
+        when (CallScreenBackPressPolicy.resolve(supportPip = pipState.supportPip, hasWebView = callWebView != null, fromNative)) {
+            CallScreenBackPressAction.EnterPictureInPicture ->
+                pipState.eventSink(PictureInPictureEvent.EnterPictureInPicture)
+            CallScreenBackPressAction.DispatchEscapeToWebView ->
+                callWebView?.dispatchEscKeyEvent()
+            null -> Timber.d("Back press with unsupported pip is a no-op")
         }
     }
 
-    Scaffold(
-        modifier = modifier,
-    ) { padding ->
-        BackHandler {
-            handleBack()
+    BackHandler {
+        handleBack(fromNative = true)
+    }
+    if (state.webViewError != null) {
+        ErrorDialog(
+            content = buildString {
+                append(stringResource(CommonStrings.error_unknown))
+                state.webViewError.takeIf { it.isNotEmpty() }?.let { append("\n\n").append(it) }
+            },
+            onSubmit = { state.eventSink(CallScreenEvent.Hangup) },
+        )
+    } else {
+        var webViewAudioManager by remember { mutableStateOf<WebViewAudioManager?>(null) }
+        val coroutineScope = rememberCoroutineScope()
+
+        var invalidAudioDeviceReason by remember { mutableStateOf<InvalidAudioDeviceReason?>(null) }
+        invalidAudioDeviceReason?.let {
+            InvalidAudioDeviceDialog(invalidAudioDeviceReason = it) {
+                invalidAudioDeviceReason = null
+            }
         }
-        if (state.webViewError != null) {
-            ErrorDialog(
-                content = buildString {
-                    append(stringResource(CommonStrings.error_unknown))
-                    state.webViewError.takeIf { it.isNotEmpty() }?.let { append("\n\n").append(it) }
-                },
-                onSubmit = { state.eventSink(CallScreenEvents.Hangup) },
-            )
-        } else {
-            var webViewAudioManager by remember { mutableStateOf<WebViewAudioManager?>(null) }
-            val coroutineScope = rememberCoroutineScope()
 
-            var invalidAudioDeviceReason by remember { mutableStateOf<InvalidAudioDeviceReason?>(null) }
-            invalidAudioDeviceReason?.let {
-                InvalidAudioDeviceDialog(invalidAudioDeviceReason = it) {
-                    invalidAudioDeviceReason = null
-                }
+        CallWebView(
+            modifier = modifier.consumeWindowInsets(WindowInsets.systemBars).fillMaxSize(),
+            url = state.urlState,
+            userAgent = state.userAgent,
+            onPermissionsRequest = { request ->
+                val androidPermissions = mapWebkitPermissions(request.resources)
+                val callback: RequestPermissionCallback = { request.grant(it) }
+                requestPermissions(androidPermissions.toTypedArray(), callback)
+            },
+            onConsoleMessage = onConsoleMessage,
+            onCreateWebView = { webView ->
+                callWebView = webView
+                webView.addBackHandler(onBackPressed = ::handleBack)
+                val interceptor = WebViewWidgetMessageInterceptor(
+                    webView = webView,
+                    onUrlLoaded = { url ->
+                        webView.evaluateJavascript("controls.onBackButtonPressed = () => { backHandler.onBackPressed() }", null)
+                        if (webViewAudioManager?.isInCallMode?.get() == false) {
+                            Timber.d("URL $url is loaded, starting in-call audio mode")
+                            webViewAudioManager?.onCallStarted()
+                        } else {
+                            Timber.d("Can't start in-call audio mode since the app is already in it.")
+                        }
+                    },
+                    onError = { state.eventSink(CallScreenEvent.OnWebViewError(it)) },
+                )
+                webViewAudioManager = WebViewAudioManager(
+                    webView = webView,
+                    coroutineScope = coroutineScope,
+                    onInvalidAudioDeviceAdded = { invalidAudioDeviceReason = it },
+                )
+                state.eventSink(CallScreenEvent.SetupMessageChannels(interceptor))
+                val pipController = WebViewPipController(webView)
+                pipState.eventSink(PictureInPictureEvent.SetPipController(pipController))
+            },
+            onDestroyWebView = {
+                callWebView = null
+                // Reset audio mode
+                webViewAudioManager?.onCallStopped()
             }
-
-            CallWebView(
-                modifier = Modifier
-                    .padding(padding)
-                    .consumeWindowInsets(padding)
-                    .fillMaxSize(),
-                url = state.urlState,
-                userAgent = state.userAgent,
-                onPermissionsRequest = { request ->
-                    val androidPermissions = mapWebkitPermissions(request.resources)
-                    val callback: RequestPermissionCallback = { request.grant(it) }
-                    requestPermissions(androidPermissions.toTypedArray(), callback)
-                },
-                onConsoleMessage = onConsoleMessage,
-                onCreateWebView = { webView ->
-                    webView.addBackHandler(onBackPressed = ::handleBack)
-                    val interceptor = WebViewWidgetMessageInterceptor(
-                        webView = webView,
-                        onUrlLoaded = { url ->
-                            webView.evaluateJavascript("controls.onBackButtonPressed = () => { backHandler.onBackPressed() }", null)
-                            if (webViewAudioManager?.isInCallMode?.get() == false) {
-                                Timber.d("URL $url is loaded, starting in-call audio mode")
-                                webViewAudioManager?.onCallStarted()
-                            } else {
-                                Timber.d("Can't start in-call audio mode since the app is already in it.")
-                            }
-                        },
-                        onError = { state.eventSink(CallScreenEvents.OnWebViewError(it)) },
-                    )
-                    webViewAudioManager = WebViewAudioManager(
-                        webView = webView,
-                        coroutineScope = coroutineScope,
-                        onInvalidAudioDeviceAdded = { invalidAudioDeviceReason = it },
-                    )
-                    state.eventSink(CallScreenEvents.SetupMessageChannels(interceptor))
-                    val pipController = WebViewPipController(webView)
-                    pipState.eventSink(PictureInPictureEvents.SetPipController(pipController))
-                },
-                onDestroyWebView = {
-                    // Reset audio mode
-                    webViewAudioManager?.onCallStopped()
-                }
-            )
-            when (state.urlState) {
-                AsyncData.Uninitialized,
-                is AsyncData.Loading ->
-                    ProgressDialog(text = stringResource(id = CommonStrings.common_please_wait))
-                is AsyncData.Failure -> {
-                    Timber.e(state.urlState.error, "WebView failed to load URL: ${state.urlState.error.message}")
-                    ErrorDialog(
-                        content = state.urlState.error.message.orEmpty(),
-                        onSubmit = { state.eventSink(CallScreenEvents.Hangup) },
-                    )
-                }
-                is AsyncData.Success -> Unit
+        )
+        when (state.urlState) {
+            AsyncData.Uninitialized,
+            is AsyncData.Loading ->
+                ProgressDialog(text = stringResource(id = CommonStrings.common_please_wait))
+            is AsyncData.Failure -> {
+                Timber.e(state.urlState.error, "WebView failed to load URL: ${state.urlState.error.message}")
+                ErrorDialog(
+                    content = state.urlState.error.message.orEmpty(),
+                    onSubmit = { state.eventSink(CallScreenEvent.Hangup) },
+                )
             }
+            is AsyncData.Success -> Unit
         }
     }
 }
@@ -248,15 +247,16 @@ private fun WebView.setup(
 
 private fun WebView.addBackHandler(onBackPressed: () -> Unit) {
     addJavascriptInterface(
-        object {
-            @Suppress("unused")
-            @JavascriptInterface
-            fun onBackPressed() = onBackPressed()
-        },
+        JavascriptBackHandlerBridge(callback = onBackPressed),
         "backHandler"
     )
 }
 
+private fun WebView.dispatchEscKeyEvent() {
+    dispatchKeyEvent(android.view.KeyEvent(android.view.KeyEvent.ACTION_DOWN, android.view.KeyEvent.KEYCODE_ESCAPE))
+    dispatchKeyEvent(android.view.KeyEvent(android.view.KeyEvent.ACTION_UP, android.view.KeyEvent.KEYCODE_ESCAPE))
+}
+
 @PreviewsDayNight
 @Composable
 internal fun CallScreenViewPreview(
@@ -275,3 +275,12 @@ internal fun CallScreenViewPreview(
 internal fun InvalidAudioDeviceDialogPreview() = ElementPreview {
     InvalidAudioDeviceDialog(invalidAudioDeviceReason = InvalidAudioDeviceReason.BT_AUDIO_DEVICE_DISABLED) {}
 }
+
+internal class JavascriptBackHandlerBridge(
+    private val callback: () -> Unit,
+) {
+    @JavascriptInterface
+    fun onBackPressed() {
+        callback()
+    }
+}

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

@@ -1,19 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2025 New Vector 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.call.impl.ui
-
-import io.element.android.features.call.api.CallType
-import io.element.android.libraries.matrix.api.core.SessionId
-
-fun CallType.getSessionId(): SessionId? {
-    return when (this) {
-        is CallType.ExternalUrl -> null
-        is CallType.RoomCall -> sessionId
-    }
-}

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

@@ -32,19 +32,21 @@ import androidx.compose.runtime.rememberUpdatedState
 import androidx.core.app.PictureInPictureModeChangedInfo
 import androidx.core.content.IntentCompat
 import androidx.core.util.Consumer
+import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.WindowInsetsControllerCompat
 import androidx.lifecycle.Lifecycle
 import dev.zacsweers.metro.Inject
 import io.element.android.compound.colors.SemanticColorsLightDark
-import io.element.android.features.call.api.CallType
-import io.element.android.features.call.api.CallType.ExternalUrl
+import io.element.android.compound.theme.ForcedDarkElementTheme
+import io.element.android.features.call.api.CallData
 import io.element.android.features.call.impl.DefaultElementCallEntryPoint
 import io.element.android.features.call.impl.di.CallBindings
-import io.element.android.features.call.impl.pip.PictureInPictureEvents
+import io.element.android.features.call.impl.pip.PictureInPictureEvent
 import io.element.android.features.call.impl.pip.PictureInPicturePresenter
 import io.element.android.features.call.impl.pip.PictureInPictureState
 import io.element.android.features.call.impl.pip.PipView
 import io.element.android.features.call.impl.services.CallForegroundService
-import io.element.android.features.call.impl.utils.CallIntentDataParser
 import io.element.android.features.enterprise.api.EnterpriseService
 import io.element.android.libraries.androidutils.browser.ConsoleMessageLogger
 import io.element.android.libraries.architecture.Presenter
@@ -54,6 +56,8 @@ import io.element.android.libraries.audio.api.AudioFocusRequester
 import io.element.android.libraries.core.log.logger.LoggerTag
 import io.element.android.libraries.core.meta.BuildMeta
 import io.element.android.libraries.designsystem.theme.ElementThemeApp
+import io.element.android.libraries.designsystem.utils.hasCompactHeightWindowSize
+import io.element.android.libraries.featureflag.api.FeatureFlagService
 import io.element.android.libraries.preferences.api.store.AppPreferencesStore
 import timber.log.Timber
 
@@ -63,9 +67,9 @@ class ElementCallActivity :
     AppCompatActivity(),
     CallScreenNavigator,
     PipView {
-    @Inject lateinit var callIntentDataParser: CallIntentDataParser
     @Inject lateinit var presenterFactory: CallScreenPresenter.Factory
     @Inject lateinit var appPreferencesStore: AppPreferencesStore
+    @Inject lateinit var featureFlagService: FeatureFlagService
     @Inject lateinit var enterpriseService: EnterpriseService
     @Inject lateinit var pictureInPicturePresenter: PictureInPicturePresenter
     @Inject lateinit var buildMeta: BuildMeta
@@ -78,9 +82,9 @@ class ElementCallActivity :
 
     private val requestPermissionsLauncher = registerPermissionResultLauncher()
 
-    private val webViewTarget = mutableStateOf<CallType?>(null)
+    private val webViewTarget = mutableStateOf<CallData?>(null)
 
-    private var eventSink: ((CallScreenEvents) -> Unit)? = null
+    private var eventSink: ((CallScreenEvent) -> Unit)? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -96,7 +100,7 @@ class ElementCallActivity :
             window.addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED)
         }
 
-        setCallType(intent)
+        setCallData(intent)
         // If presenter is not created at this point, it means we have no call to display, the Activity is finishing, so return early
         if (!::presenter.isInitialized) {
             return
@@ -109,34 +113,59 @@ class ElementCallActivity :
         setContent {
             val pipState = pictureInPicturePresenter.present()
             ListenToAndroidEvents(pipState)
-            val colors by remember(webViewTarget.value?.getSessionId()) {
-                enterpriseService.semanticColorsFlow(sessionId = webViewTarget.value?.getSessionId())
+            val colors by remember(webViewTarget.value?.sessionId) {
+                enterpriseService.semanticColorsFlow(sessionId = webViewTarget.value?.sessionId)
             }.collectAsState(SemanticColorsLightDark.default)
+
+            // When the height is compact, hide the system bars by default to maximize the space for the call, using immersive mode
+            val hasCompactHeight = hasCompactHeightWindowSize()
+            DisposableEffect(hasCompactHeight, pipState.isInPictureInPicture) {
+                if (hasCompactHeight && !pipState.isInPictureInPicture) {
+                    val window = this@ElementCallActivity.window ?: return@DisposableEffect onDispose {}
+                    val insetsController = WindowCompat.getInsetsController(window, window.decorView)
+                    val systemBarInsets = WindowInsetsCompat.Type.systemBars()
+                    insetsController.hide(systemBarInsets)
+
+                    insetsController.systemBarsBehavior = WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
+
+                    onDispose {
+                        insetsController.show(systemBarInsets)
+                        insetsController.systemBarsBehavior = WindowInsetsControllerCompat.BEHAVIOR_DEFAULT
+                    }
+                } else {
+                    onDispose {}
+                }
+            }
+
             ElementThemeApp(
                 appPreferencesStore = appPreferencesStore,
+                featureFlagService = featureFlagService,
                 compoundLight = colors.light,
                 compoundDark = colors.dark,
                 buildMeta = buildMeta,
             ) {
-                val state = presenter.present()
-                eventSink = state.eventSink
-                LaunchedEffect(state.isCallActive, state.isInWidgetMode) {
-                    // Note when not in WidgetMode, isCallActive will never be true, so consider the call is active
-                    if (state.isCallActive || !state.isInWidgetMode) {
-                        setCallIsActive()
+                ForcedDarkElementTheme(
+                    colors = colors,
+                ) {
+                    val state = presenter.present()
+                    eventSink = state.eventSink
+                    LaunchedEffect(state.isCallActive) {
+                        if (state.isCallActive) {
+                            setCallIsActive()
+                        }
                     }
+                    CallScreenView(
+                        state = state,
+                        pipState = pipState,
+                        onConsoleMessage = {
+                            consoleMessageLogger.log("ElementCall", it)
+                        },
+                        requestPermissions = { permissions, callback ->
+                            requestPermissionCallback = callback
+                            requestPermissionsLauncher.launch(permissions)
+                        }
+                    )
                 }
-                CallScreenView(
-                    state = state,
-                    pipState = pipState,
-                    onConsoleMessage = {
-                        consoleMessageLogger.log("ElementCall", it)
-                    },
-                    requestPermissions = { permissions, callback ->
-                        requestPermissionCallback = callback
-                        requestPermissionsLauncher.launch(permissions)
-                    }
-                )
             }
         }
     }
@@ -160,7 +189,7 @@ class ElementCallActivity :
                 if (requestPermissionCallback != null) {
                     Timber.tag(loggerTag.value).w("Ignoring onUserLeaveHint event because user is asked to grant permissions")
                 } else {
-                    pipEventSink(PictureInPictureEvents.EnterPictureInPicture)
+                    pipEventSink(PictureInPictureEvent.EnterPictureInPicture)
                 }
             }
             addOnUserLeaveHintListener(listener)
@@ -170,10 +199,10 @@ class ElementCallActivity :
         }
         DisposableEffect(Unit) {
             val onPictureInPictureModeChangedListener = Consumer { _: PictureInPictureModeChangedInfo ->
-                pipEventSink(PictureInPictureEvents.OnPictureInPictureModeChanged(isInPictureInPictureMode))
+                pipEventSink(PictureInPictureEvent.OnPictureInPictureModeChanged(isInPictureInPictureMode))
                 if (!isInPictureInPictureMode && !lifecycle.currentState.isAtLeast(Lifecycle.State.STARTED)) {
                     Timber.tag(loggerTag.value).d("Exiting PiP mode: Hangup the call")
-                    eventSink?.invoke(CallScreenEvents.Hangup)
+                    eventSink?.invoke(CallScreenEvent.Hangup)
                 }
             }
             addOnPictureInPictureModeChangedListener(onPictureInPictureModeChangedListener)
@@ -185,7 +214,7 @@ class ElementCallActivity :
 
     override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
-        setCallType(intent)
+        setCallData(intent)
     }
 
     override fun onDestroy() {
@@ -204,25 +233,24 @@ class ElementCallActivity :
         finish()
     }
 
-    private fun setCallType(intent: Intent?) {
-        val callType = intent?.let {
-            IntentCompat.getParcelableExtra(intent, DefaultElementCallEntryPoint.EXTRA_CALL_TYPE, CallType::class.java)
-                ?: intent.dataString?.let(::parseUrl)?.let(::ExternalUrl)
+    private fun setCallData(intent: Intent?) {
+        val callData = intent?.let {
+            IntentCompat.getParcelableExtra(intent, DefaultElementCallEntryPoint.EXTRA_CALL_TYPE, CallData::class.java)
         }
-        val currentCallType = webViewTarget.value
-        if (currentCallType == null) {
-            if (callType == null) {
+        val currentCallData = webViewTarget.value
+        if (currentCallData == null) {
+            if (callData == null) {
                 Timber.tag(loggerTag.value).d("Re-opened the activity but we have no url to load or a cached one, finish the activity")
                 finish()
             } else {
                 Timber.tag(loggerTag.value).d("Set the call type and create the presenter")
-                webViewTarget.value = callType
-                presenter = presenterFactory.create(callType, this)
+                webViewTarget.value = callData
+                presenter = presenterFactory.create(callData, this)
             }
         } else {
-            if (callType == null) {
+            if (callData == null) {
                 Timber.tag(loggerTag.value).d("Coming back from notification, do nothing")
-            } else if (callType != currentCallType) {
+            } else if (callData != currentCallData) {
                 Timber.tag(loggerTag.value).d("User starts another call, restart the Activity")
                 setIntent(intent)
                 recreate()
@@ -233,8 +261,6 @@ class ElementCallActivity :
         }
     }
 
-    private fun parseUrl(url: String?): String? = callIntentDataParser.parse(url)
-
     private fun registerPermissionResultLauncher(): ActivityResultLauncher<Array<String>> {
         return registerForActivityResult(
             ActivityResultContracts.RequestMultiplePermissions()
@@ -284,7 +310,7 @@ class ElementCallActivity :
     }
 
     override fun hangUp() {
-        eventSink?.invoke(CallScreenEvents.Hangup)
+        eventSink?.invoke(CallScreenEvent.Hangup)
     }
 }
 

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

@@ -19,7 +19,7 @@ import androidx.core.content.IntentCompat
 import androidx.lifecycle.lifecycleScope
 import dev.zacsweers.metro.Inject
 import io.element.android.compound.colors.SemanticColorsLightDark
-import io.element.android.features.call.api.CallType
+import io.element.android.features.call.api.CallData
 import io.element.android.features.call.api.ElementCallEntryPoint
 import io.element.android.features.call.impl.di.CallBindings
 import io.element.android.features.call.impl.notifications.CallNotificationData
@@ -30,6 +30,7 @@ import io.element.android.libraries.architecture.bindings
 import io.element.android.libraries.core.meta.BuildMeta
 import io.element.android.libraries.designsystem.theme.ElementThemeApp
 import io.element.android.libraries.di.annotations.AppCoroutineScope
+import io.element.android.libraries.featureflag.api.FeatureFlagService
 import io.element.android.libraries.preferences.api.store.AppPreferencesStore
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.filter
@@ -57,6 +58,9 @@ class IncomingCallActivity : AppCompatActivity() {
     @Inject
     lateinit var appPreferencesStore: AppPreferencesStore
 
+    @Inject
+    lateinit var featureFlagService: FeatureFlagService
+
     @Inject
     lateinit var enterpriseService: EnterpriseService
 
@@ -88,6 +92,7 @@ class IncomingCallActivity : AppCompatActivity() {
                 }.collectAsState(SemanticColorsLightDark.default)
                 ElementThemeApp(
                     appPreferencesStore = appPreferencesStore,
+                    featureFlagService = featureFlagService,
                     compoundLight = colors.light,
                     compoundDark = colors.dark,
                     buildMeta = buildMeta,
@@ -113,10 +118,10 @@ class IncomingCallActivity : AppCompatActivity() {
 
     private fun onAnswer(notificationData: CallNotificationData) {
         elementCallEntryPoint.startCall(
-            CallType.RoomCall(
-                notificationData.sessionId,
-                notificationData.roomId,
-                isAudioCall = notificationData.audioOnly
+            CallData(
+                sessionId = notificationData.sessionId,
+                roomId = notificationData.roomId,
+                isAudioCall = notificationData.audioOnly,
             )
         )
     }
@@ -124,7 +129,7 @@ class IncomingCallActivity : AppCompatActivity() {
     private fun onCancel() {
         val activeCall = activeCallManager.activeCall.value ?: return
         appCoroutineScope.launch {
-            activeCallManager.hangUpCall(callType = activeCall.callType)
+            activeCallManager.hangUpCall(callData = activeCall.callData)
         }
     }
 }

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

@@ -20,7 +20,7 @@ import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
 import dev.zacsweers.metro.SingleIn
 import io.element.android.appconfig.ElementCallConfig
-import io.element.android.features.call.api.CallType
+import io.element.android.features.call.api.CallData
 import io.element.android.features.call.api.CurrentCall
 import io.element.android.features.call.impl.notifications.CallNotificationData
 import io.element.android.features.call.impl.notifications.RingingCallNotificationCreator
@@ -73,20 +73,20 @@ interface ActiveCallManager {
 
     /**
      * Called to hang up the active call. It will hang up the call and remove any existing UI and the active call.
-     * @param callType The type of call that the user hangs up, either an external url one or a room one.
+     * @param callData The data about the call.
      * @param notificationData The data for the incoming call notification.
      */
     suspend fun hangUpCall(
-        callType: CallType,
+        callData: CallData,
         notificationData: CallNotificationData? = null,
     )
 
     /**
      * Called after the user joined a call. It will remove any existing UI and set the call state as [CallState.InCall].
      *
-     * @param callType The type of call that the user joined, either an external url one or a room one.
+     * @param callData The data about the call.
      */
-    suspend fun joinedCall(callType: CallType)
+    suspend fun joinedCall(callData: CallData)
 }
 
 @SingleIn(AppScope::class)
@@ -143,7 +143,7 @@ class DefaultActiveCallManager(
                 return
             }
             activeCall.value = ActiveCall(
-                callType = CallType.RoomCall(
+                callData = CallData(
                     sessionId = notificationData.sessionId,
                     roomId = notificationData.roomId,
                     isAudioCall = notificationData.audioOnly,
@@ -198,17 +198,17 @@ class DefaultActiveCallManager(
     }
 
     override suspend fun hangUpCall(
-        callType: CallType,
+        callData: CallData,
         notificationData: CallNotificationData?,
     ) = mutex.withLock {
-        Timber.tag(tag).d("Hang up call: $callType")
+        Timber.tag(tag).d("Hang up call: $callData")
         cancelIncomingCallNotification()
         val currentActiveCall = activeCall.value ?: run {
             // activeCall.value can be null if the application has been killed while the call was ringing
             // Build a currentActiveCall with the provided parameters.
             notificationData?.let {
                 ActiveCall(
-                    callType = callType,
+                    callData = callData,
                     callState = CallState.Ringing(
                         notificationData = notificationData,
                     )
@@ -219,8 +219,8 @@ class DefaultActiveCallManager(
             return@withLock
         }
 
-        if (currentActiveCall.callType != callType) {
-            Timber.tag(tag).w("Call type $callType does not match the active call type, ignoring")
+        if (currentActiveCall.callData != callData) {
+            Timber.tag(tag).w("Call type $callData does not match the active call type, ignoring")
             return@withLock
         }
         if (currentActiveCall.callState is CallState.Ringing) {
@@ -244,8 +244,8 @@ class DefaultActiveCallManager(
         activeCall.value = null
     }
 
-    override suspend fun joinedCall(callType: CallType) = mutex.withLock {
-        Timber.tag(tag).d("Joined call: $callType")
+    override suspend fun joinedCall(callData: CallData) = mutex.withLock {
+        Timber.tag(tag).d("Joined call: $callData")
         cancelIncomingCallNotification()
         if (activeWakeLock?.isHeld == true) {
             Timber.tag(tag).d("Releasing partial wakelock after joining call")
@@ -254,7 +254,7 @@ class DefaultActiveCallManager(
         timedOutCallJob?.cancel()
 
         activeCall.value = ActiveCall(
-            callType = callType,
+            callData = callData,
             callState = CallState.InCall,
         )
     }
@@ -307,15 +307,15 @@ class DefaultActiveCallManager(
     private fun observeRingingCall() {
         activeCall
             .filterNotNull()
-            .filter { it.callState is CallState.Ringing && it.callType is CallType.RoomCall }
+            .filter { it.callState is CallState.Ringing }
             .flatMapLatest { activeCall ->
-                val callType = activeCall.callType as CallType.RoomCall
+                val callData = activeCall.callData
                 val ringingInfo = activeCall.callState as CallState.Ringing
-                val client = matrixClientProvider.getOrRestore(callType.sessionId).getOrNull() ?: run {
+                val client = matrixClientProvider.getOrRestore(callData.sessionId).getOrNull() ?: run {
                     Timber.tag(tag).d("Couldn't find session for incoming call: $activeCall")
                     return@flatMapLatest flowOf()
                 }
-                val room = client.getRoom(callType.roomId) ?: run {
+                val room = client.getRoom(callData.roomId) ?: run {
                     Timber.tag(tag).d("Couldn't find room for incoming call: $activeCall")
                     return@flatMapLatest flowOf()
                 }
@@ -346,17 +346,17 @@ class DefaultActiveCallManager(
         // has joined the call from another session.
         activeCall
             .filterNotNull()
-            .filter { it.callState is CallState.Ringing && it.callType is CallType.RoomCall }
+            .filter { it.callState is CallState.Ringing }
             .flatMapLatest { activeCall ->
-                val callType = activeCall.callType as CallType.RoomCall
+                val callData = activeCall.callData
                 // Get a flow of updated `hasRoomCall` and `activeRoomCallParticipants` values for the room
-                val room = matrixClientProvider.getOrRestore(callType.sessionId).getOrNull()?.getRoom(callType.roomId) ?: run {
+                val room = matrixClientProvider.getOrRestore(callData.sessionId).getOrNull()?.getRoom(callData.roomId) ?: run {
                     Timber.tag(tag).d("Couldn't find room for incoming call: $activeCall")
                     return@flatMapLatest flowOf()
                 }
                 room.roomInfoFlow.map {
                     Timber.tag(tag).d("Has room call status changed for ringing call: ${it.hasRoomCall}")
-                    it.hasRoomCall to (callType.sessionId in it.activeRoomCallParticipants)
+                    it.hasRoomCall to (callData.sessionId in it.activeRoomCallParticipants)
                 }
             }
             // We only want to check if the room active call status changes
@@ -388,10 +388,7 @@ class DefaultActiveCallManager(
                             // Nothing to do
                         }
                         is CallState.InCall -> {
-                            when (val callType = value.callType) {
-                                is CallType.ExternalUrl -> defaultCurrentCallService.onCallStarted(CurrentCall.ExternalUrl(callType.url))
-                                is CallType.RoomCall -> defaultCurrentCallService.onCallStarted(CurrentCall.RoomCall(callType.roomId))
-                            }
+                            defaultCurrentCallService.onCallStarted(CurrentCall.RoomCall(value.callData.roomId))
                         }
                     }
                 }
@@ -404,7 +401,7 @@ class DefaultActiveCallManager(
  * Represents an active call.
  */
 data class ActiveCall(
-    val callType: CallType,
+    val callData: CallData,
     val callState: CallState,
 )
 

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

@@ -1,98 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2023-2025 New Vector 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.call.impl.utils
-
-import android.net.Uri
-import androidx.core.net.toUri
-import dev.zacsweers.metro.Inject
-
-@Inject
-class CallIntentDataParser {
-    private val validHttpSchemes = sequenceOf("https")
-    private val knownHosts = sequenceOf(
-        "call.element.io",
-    )
-
-    fun parse(data: String?): String? {
-        val parsedUrl = data?.toUri() ?: return null
-        val scheme = parsedUrl.scheme
-        return when {
-            scheme in validHttpSchemes -> parsedUrl
-            scheme == "element" && parsedUrl.host == "call" -> {
-                parsedUrl.getUrlParameter()
-            }
-            scheme == "io.element.call" && parsedUrl.host == null -> {
-                parsedUrl.getUrlParameter()
-            }
-            // This should never be possible, but we still need to take into account the possibility
-            else -> null
-        }
-            ?.takeIf { it.host in knownHosts }
-            ?.withCustomParameters()
-    }
-
-    private fun Uri.getUrlParameter(): Uri? {
-        return getQueryParameter("url")
-            ?.let { urlParameter ->
-                urlParameter.toUri().takeIf { uri ->
-                    uri.scheme in validHttpSchemes && !uri.host.isNullOrBlank()
-                }
-            }
-    }
-}
-
-/**
- * Ensure the uri has the following parameters and value in the fragment:
- * - appPrompt=false
- * - confineToRoom=true
- * to ensure that the rendering will bo correct on the embedded Webview.
- */
-private fun Uri.withCustomParameters(): String {
-    val builder = buildUpon()
-    // Remove the existing query parameters
-    builder.clearQuery()
-    queryParameterNames.forEach {
-        if (it == APP_PROMPT_PARAMETER || it == CONFINE_TO_ROOM_PARAMETER) return@forEach
-        builder.appendQueryParameter(it, getQueryParameter(it))
-    }
-    // Remove the existing fragment parameters, and build the new fragment
-    val currentFragment = fragment ?: ""
-    // Reset the current fragment
-    builder.fragment("")
-    val queryFragmentPosition = currentFragment.lastIndexOf("?")
-    val newFragment = if (queryFragmentPosition == -1) {
-        // No existing query, build it.
-        "$currentFragment?$APP_PROMPT_PARAMETER=false&$CONFINE_TO_ROOM_PARAMETER=true"
-    } else {
-        buildString {
-            append(currentFragment.substring(0, queryFragmentPosition + 1))
-            val queryFragment = currentFragment.substring(queryFragmentPosition + 1)
-            // Replace the existing parameters
-            val newQueryFragment = queryFragment
-                .replace("$APP_PROMPT_PARAMETER=true", "$APP_PROMPT_PARAMETER=false")
-                .replace("$CONFINE_TO_ROOM_PARAMETER=false", "$CONFINE_TO_ROOM_PARAMETER=true")
-            append(newQueryFragment)
-            // Ensure the parameters are there
-            if (!newQueryFragment.contains("$APP_PROMPT_PARAMETER=false")) {
-                if (newQueryFragment.isNotEmpty()) {
-                    append("&")
-                }
-                append("$APP_PROMPT_PARAMETER=false")
-            }
-            if (!newQueryFragment.contains("$CONFINE_TO_ROOM_PARAMETER=true")) {
-                append("&$CONFINE_TO_ROOM_PARAMETER=true")
-            }
-        }
-    }
-    // We do not want to encode the Fragment part, so append it manually
-    return builder.build().toString() + "#" + newFragment
-}
-
-private const val APP_PROMPT_PARAMETER = "appPrompt"
-private const val CONFINE_TO_ROOM_PARAMETER = "confineToRoom"

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

@@ -14,7 +14,6 @@ import io.element.android.libraries.core.extensions.runCatchingExceptions
 import io.element.android.libraries.matrix.api.MatrixClientProvider
 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.room.isDm
 import io.element.android.libraries.matrix.api.widget.CallWidgetSettingsProvider
 import io.element.android.libraries.preferences.api.store.AppPreferencesStore
 import io.element.android.services.appnavstate.api.ActiveRoomsHolder

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

@@ -12,21 +12,21 @@ import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
 import androidx.core.app.PendingIntentCompat
-import io.element.android.features.call.api.CallType
+import io.element.android.features.call.api.CallData
 import io.element.android.features.call.impl.DefaultElementCallEntryPoint
 import io.element.android.features.call.impl.ui.ElementCallActivity
 
 internal object IntentProvider {
-    fun createIntent(context: Context, callType: CallType): Intent = Intent(context, ElementCallActivity::class.java).apply {
-        putExtra(DefaultElementCallEntryPoint.EXTRA_CALL_TYPE, callType)
+    fun createIntent(context: Context, callData: CallData): Intent = Intent(context, ElementCallActivity::class.java).apply {
+        putExtra(DefaultElementCallEntryPoint.EXTRA_CALL_TYPE, callData)
         addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_NO_USER_ACTION)
     }
 
-    fun getPendingIntent(context: Context, callType: CallType): PendingIntent {
+    fun getPendingIntent(context: Context, callData: CallData): PendingIntent {
         return PendingIntentCompat.getActivity(
             context,
             DefaultElementCallEntryPoint.REQUEST_CODE,
-            createIntent(context, callType),
+            createIntent(context, callData),
             PendingIntent.FLAG_CANCEL_CURRENT,
             false
         )!!

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

@@ -64,6 +64,11 @@ class WebViewAudioManager(
      */
     private val isWebViewAudioEnabled = AtomicBoolean(true)
 
+    /**
+     * Store the device id requested by EC, and re-set it if something try to switch (only android S+).
+     */
+    private var ecRequestedDeviceId: String? = null
+
     /**
      * The list of device types that are considered as communication devices, sorted by likelihood of it being used for communication.
      */
@@ -113,22 +118,12 @@ class WebViewAudioManager(
     @get:RequiresApi(Build.VERSION_CODES.S)
     private val commsDeviceChangedListener by lazy {
         AudioManager.OnCommunicationDeviceChangedListener { device ->
-            if (device != null && device.id == expectedNewCommunicationDeviceId) {
-                expectedNewCommunicationDeviceId = null
-                Timber.d("Audio device changed, type: ${device.type}")
-                updateSelectedAudioDeviceInWebView(device.id.toString())
-            } else if (device != null && device.id != expectedNewCommunicationDeviceId) {
-                // We were expecting a device change but it didn't happen, so we should retry
-                val expectedDeviceId = expectedNewCommunicationDeviceId
-                if (expectedDeviceId != null) {
-                    // Remove the expected id so we only retry once
-                    expectedNewCommunicationDeviceId = null
-                    audioManager.selectAudioDevice(expectedDeviceId.toString())
-                }
-            } else {
-                Timber.d("Audio device cleared")
-                expectedNewCommunicationDeviceId = null
-                audioManager.selectAudioDevice(null)
+            Timber.d("Audio device changed, type: ${device?.id}")
+            val wantedDevice = this.ecRequestedDeviceId
+            if (wantedDevice != null && this.ecRequestedDeviceId != device?.id?.toString()) {
+                // We want to ensure that we stick to what EC selected even if it was changed outside
+                Timber.d("Audio device changed to unwanted device ${device?.id}, enforce using the expected device $wantedDevice")
+                audioManager.selectAudioDevice(wantedDevice)
             }
         }
     }
@@ -144,40 +139,15 @@ class WebViewAudioManager(
             // We need to calculate the available devices ourselves, since calling `listAudioDevices` will return an outdated list
             val audioDevices = (listAudioDevices() + validNewDevices).distinctBy { it.id }.sortedWith(audioDeviceComparator)
             setAvailableAudioDevices(audioDevices.map(SerializableAudioDevice::fromAudioDeviceInfo))
-            // This should automatically switch to a new device if it has a higher priority than the current one
-            selectDefaultAudioDevice(audioDevices)
         }
 
         override fun onAudioDevicesRemoved(removedDevices: Array<out AudioDeviceInfo>?) {
             // Update the available devices
+            // Element Call will then decide to switch devices if needed
             setAvailableAudioDevices()
-
-            // Unless the removed device is the current one, we don't need to do anything else
-            val removedCurrentDevice = removedDevices.orEmpty().any { it.id == currentDeviceId }
-            if (!removedCurrentDevice) return
-
-            val previousDevice = previousSelectedDevice
-            if (previousDevice != null) {
-                previousSelectedDevice = null
-                // If we have a previous device, we should select it again
-                audioManager.selectAudioDevice(previousDevice.id.toString())
-            } else {
-                // If we don't have a previous device, we should select the default one
-                selectDefaultAudioDevice()
-            }
         }
     }
 
-    /**
-     * The currently used audio device id.
-     */
-    private var currentDeviceId: Int? = null
-
-    /**
-     * When a new audio device is selected but not yet set as the communication device by the OS, this id is used to check if the device is the expected one.
-     */
-    private var expectedNewCommunicationDeviceId: Int? = null
-
     /**
      * Previously selected device, used to restore the selection when the selected device is removed.
      */
@@ -231,16 +201,12 @@ class WebViewAudioManager(
             return
         }
 
-        coroutineScope.launch {
-            proximitySensorMutex.withLock {
-                if (proximitySensorWakeLock?.isHeld == true) {
-                    proximitySensorWakeLock?.release()
-                }
-            }
+        // Since this should run when the call is no longer running, it should be OK to not use the mutex here
+        if (proximitySensorWakeLock?.isHeld == true) {
+            proximitySensorWakeLock?.release()
         }
 
         audioManager.mode = AudioManager.MODE_NORMAL
-
         if (!hasRegisteredCallbacks) {
             Timber.w("Audio: tried to disable webview in-call audio mode without registering callbacks")
             return
@@ -263,6 +229,7 @@ class WebViewAudioManager(
         val webViewAudioDeviceSelectedCallback = AndroidWebViewAudioBridge(
             onAudioDeviceSelected = { selectedDeviceId ->
                 previousSelectedDevice = listAudioDevices().find { it.id.toString() == selectedDeviceId }
+                this.ecRequestedDeviceId = selectedDeviceId
                 audioManager.selectAudioDevice(selectedDeviceId)
             },
             onAudioPlaybackStarted = {
@@ -297,8 +264,8 @@ class WebViewAudioManager(
     private fun setWebViewAndroidNativeBridge() {
         Timber.d("Adding callback in controls.onAudioPlaybackStarted")
         webView.evaluateJavascript("controls.onAudioPlaybackStarted = () => { androidNativeBridge.onTrackReady(); };", null)
-        Timber.d("Adding callback in controls.onOutputDeviceSelect")
-        webView.evaluateJavascript("controls.onOutputDeviceSelect = (id) => { androidNativeBridge.setOutputDevice(id); };", null)
+        Timber.d("Adding callback in controls.onAudioDeviceSelect")
+        webView.evaluateJavascript("controls.onAudioDeviceSelect = (id) => { androidNativeBridge.setAudioDevice(id); };", null)
     }
 
     /**
@@ -325,39 +292,11 @@ class WebViewAudioManager(
     ) {
         Timber.d("Updating available audio devices")
         val deviceList = json.encodeToString(devices)
-        webView.evaluateJavascript("controls.setAvailableOutputDevices($deviceList);", {
-            Timber.d("Audio: setAvailableOutputDevices result: $it")
+        webView.evaluateJavascript("controls.setAvailableAudioDevices($deviceList);", {
+            Timber.d("Audio: setAvailableAudioDevices result: $it")
         })
     }
 
-    /**
-     * Selects the default audio device based on the sorted available devices.
-     *
-     * @param availableDevices The list of available audio devices to select from. If not provided, it will use the current list of audio devices.
-     */
-    private fun selectDefaultAudioDevice(availableDevices: List<AudioDeviceInfo> = listAudioDevices()) {
-        val selectedDevice = availableDevices.firstOrNull()
-        expectedNewCommunicationDeviceId = selectedDevice?.id
-        audioManager.selectAudioDevice(selectedDevice)
-
-        selectedDevice?.let {
-            updateSelectedAudioDeviceInWebView(it.id.toString())
-        } ?: run {
-            Timber.w("Audio: unable to select default audio device")
-        }
-    }
-
-    /**
-     * Updates the WebView's UI to reflect the selected audio device.
-     *
-     * @param deviceId The id of the selected audio device.
-     */
-    private fun updateSelectedAudioDeviceInWebView(deviceId: String) {
-        coroutineScope.launch(Dispatchers.Main) {
-            webView.evaluateJavascript("controls.setOutputDevice('$deviceId');", null)
-        }
-    }
-
     /**
      * Selects the audio device on the OS based on the provided device id.
      *
@@ -381,14 +320,14 @@ class WebViewAudioManager(
      *
      * @param device The info of the audio device to select, or none to clear the selected device.
      */
-    @Suppress("DEPRECATION")
     private fun AudioManager.selectAudioDevice(device: AudioDeviceInfo?) {
-        currentDeviceId = device?.id
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
             if (device != null) {
                 runCatchingExceptions {
                     Timber.d("Setting communication device: ${device.id} - ${deviceName(device.type, device.productName.toString())}")
-                    setCommunicationDevice(device)
+                    if (!setCommunicationDevice(device)) {
+                        Timber.w("Failed to setCommunication device")
+                    }
                 }.onFailure {
                     Timber.e(it, "Could not set communication device.")
                 }
@@ -402,6 +341,7 @@ class WebViewAudioManager(
         } else {
             // On Android 11 and lower, we don't have the concept of communication devices
             // We have to call the right methods based on the device type
+            @Suppress("DEPRECATION")
             if (device != null) {
                 if (device.type == AudioDeviceInfo.TYPE_BLUETOOTH_SCO && disableBluetoothAudioDevices) {
                     Timber.w("Bluetooth audio devices are disabled on this Android version")
@@ -418,14 +358,14 @@ class WebViewAudioManager(
             }
         }
 
-        expectedNewCommunicationDeviceId = null
-
         coroutineScope.launch {
             proximitySensorMutex.withLock {
                 @Suppress("WakeLock", "WakeLockTimeout")
-                if (device?.type == AudioDeviceInfo.TYPE_BUILTIN_EARPIECE && proximitySensorWakeLock?.isHeld == false) {
-                    // If the device is the built-in earpiece, we need to acquire the proximity sensor wake lock
-                    proximitySensorWakeLock?.acquire()
+                if (device?.type == AudioDeviceInfo.TYPE_BUILTIN_EARPIECE) {
+                    if (proximitySensorWakeLock?.isHeld == false) {
+                        // If the device is the built-in earpiece, we need to acquire the proximity sensor wake lock
+                        proximitySensorWakeLock?.acquire()
+                    }
                 } else if (proximitySensorWakeLock?.isHeld == true) {
                     // If the device is no longer the earpiece, we need to release the wake lock
                     proximitySensorWakeLock?.release()
@@ -457,7 +397,7 @@ private class AndroidWebViewAudioBridge(
     private val onAudioPlaybackStarted: () -> Unit,
 ) {
     @JavascriptInterface
-    fun setOutputDevice(id: String) {
+    fun setAudioDevice(id: String) {
         Timber.d("Audio device selected in webview, id: $id")
         onAudioDeviceSelected(id)
     }

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

@@ -140,26 +140,33 @@ class WebViewWidgetMessageInterceptor(
             }
         }
 
-        // Create a WebMessageListener, which will receive messages from the WebView and reply to them
-        val webMessageListener = WebViewCompat.WebMessageListener { _, message, _, _, _ ->
-            onMessageReceived(message.data)
-        }
+        // Always register JavascriptInterface as the baseline message channel.
+        // This works on all WebView implementations including Huawei.
+        webView.addJavascriptInterface(object {
+            @JavascriptInterface
+            fun postMessage(json: String?) {
+                onMessageReceived(json)
+            }
+        }, LISTENER_NAME)
 
-        // Use WebMessageListener if supported, otherwise use JavascriptInterface
-        if (WebViewFeature.isFeatureSupported(WebViewFeature.WEB_MESSAGE_LISTENER)) {
+        // Additionally register WebMessageListener on WebViews that reliably support it.
+        // Huawei WebView (Chromium < 119) reports WEB_MESSAGE_LISTENER as supported
+        // but silently drops messages, so we only trust it on Chromium 119+.
+        // See: https://github.com/element-hq/element-x-android/issues/6632
+        val webViewVersionName = WebViewCompat.getCurrentWebViewPackage(webView.context)?.versionName.orEmpty()
+        Timber.d("Using WebView version: $webViewVersionName")
+        val webViewVersionCode = webViewVersionName.split(".").firstOrNull()?.toIntOrNull() ?: 0
+
+        if (webViewVersionCode >= 119 &&
+            WebViewFeature.isFeatureSupported(WebViewFeature.WEB_MESSAGE_LISTENER)) {
             WebViewCompat.addWebMessageListener(
                 webView,
                 LISTENER_NAME,
                 setOf("*"),
-                webMessageListener
-            )
-        } else {
-            webView.addJavascriptInterface(object {
-                @JavascriptInterface
-                fun postMessage(json: String?) {
-                    onMessageReceived(json)
+                WebViewCompat.WebMessageListener { _, message, _, _, _ ->
+                    onMessageReceived(message.data)
                 }
-            }, LISTENER_NAME)
+            )
         }
     }
 

features/call/impl/src/main/res/values-ca/translations.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_foreground_service_channel_title_android">"Trucada en curs"</string>
+  <string name="call_foreground_service_message_android">"Toca per tornar a la trucada"</string>
+  <string name="call_foreground_service_title_android">"☎️ Trucada en curs"</string>
+  <string name="screen_incoming_call_subtitle_android">"Element Call entrant"</string>
+</resources>

features/call/impl/src/main/res/values-et/translations.xml

@@ -4,5 +4,5 @@
   <string name="call_foreground_service_message_android">"Kõne juurde naasmiseks klõpsa"</string>
   <string name="call_foreground_service_title_android">"☎️ Kõne on pooleli"</string>
   <string name="call_invalid_audio_device_bluetooth_devices_disabled">"Element Call ei võimalda selles Androidi versioonis Bluetoothi heliseadmete kasutamist. Palun vali mõni muu heliseade."</string>
-  <string name="screen_incoming_call_subtitle_android">"Sissetulev Element Calli kõne"</string>
+  <string name="screen_incoming_call_subtitle_android">"Saabuv Element Calli kõne"</string>
 </resources>

features/call/impl/src/main/res/values-ja/translations.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_foreground_service_channel_title_android">"通話中"</string>
+  <string name="call_foreground_service_message_android">"タップして通話に戻る"</string>
+  <string name="call_foreground_service_title_android">"☎️ 通話中"</string>
+  <string name="call_invalid_audio_device_bluetooth_devices_disabled">"Element CallはこのAndroidバージョンにおいて、Bluetoothオーディオデバイスの使用をサポートしていません。別のオーディオデバイスを選択してください。"</string>
+  <string name="screen_incoming_call_subtitle_android">"Element Call の着信"</string>
+</resources>

features/call/impl/src/main/res/values-vi/translations.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_foreground_service_channel_title_android">"Cuộc gọi đang diễn ra"</string>
+  <string name="call_foreground_service_message_android">"Nhấn để quay lại cuộc gọi."</string>
+  <string name="call_foreground_service_title_android">"☎️ Cuộc gọi đang diễn ra"</string>
+  <string name="call_invalid_audio_device_bluetooth_devices_disabled">"Ứng dụng Element Call không hỗ trợ sử dụng thiết bị âm thanh Bluetooth trên phiên bản Android này. Vui lòng chọn thiết bị âm thanh khác."</string>
+  <string name="screen_incoming_call_subtitle_android">"Cuộc gọi Element đến"</string>
+</resources>

features/call/impl/src/main/res/values-zh/translations.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="call_foreground_service_channel_title_android">"通话进行中"</string>
-  <string name="call_foreground_service_message_android">"点按即可返回通话"</string>
+  <string name="call_foreground_service_channel_title_android">"正在进行的通话"</string>
+  <string name="call_foreground_service_message_android">"点击以返回通话"</string>
   <string name="call_foreground_service_title_android">"☎️ 通话中"</string>
-  <string name="call_invalid_audio_device_bluetooth_devices_disabled">"Element Call 不支持在此 Android 版本中使用蓝牙音频设备。请选择其他音频设备。"</string>
-  <string name="screen_incoming_call_subtitle_android">"Element 来电"</string>
+  <string name="call_invalid_audio_device_bluetooth_devices_disabled">"Element Call 不支持在此 Android 版本中使用蓝牙音频设备。请选择其它音频设备。"</string>
+  <string name="screen_incoming_call_subtitle_android">"Element Call 来电"</string>
 </resources>

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

@@ -11,7 +11,7 @@ package io.element.android.features.call
 import android.content.Intent
 import androidx.test.platform.app.InstrumentationRegistry
 import com.google.common.truth.Truth.assertThat
-import io.element.android.features.call.api.CallType
+import io.element.android.features.call.api.CallData
 import io.element.android.features.call.impl.DefaultElementCallEntryPoint
 import io.element.android.features.call.impl.notifications.CallNotificationData
 import io.element.android.features.call.impl.ui.ElementCallActivity
@@ -21,23 +21,21 @@ import io.element.android.libraries.matrix.test.A_ROOM_ID
 import io.element.android.libraries.matrix.test.A_SESSION_ID
 import io.element.android.libraries.matrix.test.A_USER_ID_2
 import io.element.android.tests.testutils.lambda.lambdaRecorder
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.advanceTimeBy
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
 import org.robolectric.RuntimeEnvironment
 import org.robolectric.Shadows.shadowOf
 import kotlin.time.Duration.Companion.seconds
 
-@RunWith(RobolectricTestRunner::class)
-class DefaultElementCallEntryPointTest {
+class DefaultElementCallEntryPointTest : RobolectricTest() {
     @Test
     fun `startCall - starts ElementCallActivity setup with the needed extras`() = runTest {
         val entryPoint = createEntryPoint()
-        entryPoint.startCall(CallType.RoomCall(A_SESSION_ID, A_ROOM_ID, isAudioCall = false))
+        entryPoint.startCall(CallData(A_SESSION_ID, A_ROOM_ID, isAudioCall = false))
 
         val expectedIntent = Intent(InstrumentationRegistry.getInstrumentation().targetContext, ElementCallActivity::class.java)
         val intent = shadowOf(RuntimeEnvironment.getApplication()).nextStartedActivity
@@ -53,7 +51,7 @@ class DefaultElementCallEntryPointTest {
         val entryPoint = createEntryPoint(activeCallManager = activeCallManager)
 
         entryPoint.handleIncomingCall(
-            callType = CallType.RoomCall(A_SESSION_ID, A_ROOM_ID, isAudioCall = false),
+            callData = CallData(A_SESSION_ID, A_ROOM_ID, isAudioCall = false),
             eventId = AN_EVENT_ID,
             senderId = A_USER_ID_2,
             roomName = "roomName",

features/call/impl/src/test/kotlin/io/element/android/features/call/impl/notifications/CallNotificationData.kt

@@ -6,9 +6,8 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.features.call.test
+package io.element.android.features.call.impl.notifications
 
-import io.element.android.features.call.impl.notifications.CallNotificationData
 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.SessionId

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

@@ -8,11 +8,9 @@
 
 package io.element.android.features.call.impl.pip
 
-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.tests.testutils.lambda.lambdaRecorder
+import io.element.android.tests.testutils.test
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 
@@ -20,9 +18,7 @@ class PictureInPicturePresenterTest {
     @Test
     fun `when pip is not supported, the state value supportPip is false`() = runTest {
         val presenter = createPictureInPicturePresenter(supportPip = false)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             assertThat(initialState.supportPip).isFalse()
         }
@@ -35,9 +31,7 @@ class PictureInPicturePresenterTest {
             supportPip = true,
             pipView = FakePipView(setPipParamsResult = { }),
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             assertThat(initialState.supportPip).isTrue()
         }
@@ -53,18 +47,16 @@ class PictureInPicturePresenterTest {
                 enterPipModeResult = enterPipModeResult,
             ),
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             assertThat(initialState.isInPictureInPicture).isFalse()
-            initialState.eventSink(PictureInPictureEvents.EnterPictureInPicture)
+            initialState.eventSink(PictureInPictureEvent.EnterPictureInPicture)
             enterPipModeResult.assertions().isCalledOnce()
-            initialState.eventSink(PictureInPictureEvents.OnPictureInPictureModeChanged(true))
+            initialState.eventSink(PictureInPictureEvent.OnPictureInPictureModeChanged(true))
             val pipState = awaitItem()
             assertThat(pipState.isInPictureInPicture).isTrue()
             // User stops pip
-            initialState.eventSink(PictureInPictureEvents.OnPictureInPictureModeChanged(false))
+            initialState.eventSink(PictureInPictureEvent.OnPictureInPictureModeChanged(false))
             val finalState = awaitItem()
             assertThat(finalState.isInPictureInPicture).isFalse()
         }
@@ -80,12 +72,10 @@ class PictureInPicturePresenterTest {
                 handUpResult = handUpResult
             ),
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
-            initialState.eventSink(PictureInPictureEvents.SetPipController(FakePipController(canEnterPipResult = { false })))
-            initialState.eventSink(PictureInPictureEvents.EnterPictureInPicture)
+            initialState.eventSink(PictureInPictureEvent.SetPipController(FakePipController(canEnterPipResult = { false })))
+            initialState.eventSink(PictureInPictureEvent.EnterPictureInPicture)
             handUpResult.assertions().isCalledOnce()
         }
     }
@@ -102,12 +92,10 @@ class PictureInPicturePresenterTest {
                 enterPipModeResult = enterPipModeResult
             ),
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             initialState.eventSink(
-                PictureInPictureEvents.SetPipController(
+                PictureInPictureEvent.SetPipController(
                     FakePipController(
                         canEnterPipResult = { true },
                         enterPipResult = enterPipResult,
@@ -115,16 +103,16 @@ class PictureInPicturePresenterTest {
                     )
                 )
             )
-            initialState.eventSink(PictureInPictureEvents.EnterPictureInPicture)
+            initialState.eventSink(PictureInPictureEvent.EnterPictureInPicture)
             enterPipModeResult.assertions().isCalledOnce()
             enterPipResult.assertions().isNeverCalled()
-            initialState.eventSink(PictureInPictureEvents.OnPictureInPictureModeChanged(true))
+            initialState.eventSink(PictureInPictureEvent.OnPictureInPictureModeChanged(true))
             val pipState = awaitItem()
             assertThat(pipState.isInPictureInPicture).isTrue()
             enterPipResult.assertions().isCalledOnce()
             // User stops pip
             exitPipResult.assertions().isNeverCalled()
-            initialState.eventSink(PictureInPictureEvents.OnPictureInPictureModeChanged(false))
+            initialState.eventSink(PictureInPictureEvent.OnPictureInPictureModeChanged(false))
             val finalState = awaitItem()
             assertThat(finalState.isInPictureInPicture).isFalse()
             exitPipResult.assertions().isCalledOnce()

features/call/impl/src/test/kotlin/io/element/android/features/call/notifications/RingingCallNotificationCreatorTest.kt

@@ -23,13 +23,11 @@ import io.element.android.libraries.matrix.test.FakeMatrixClientProvider
 import io.element.android.libraries.matrix.ui.media.test.FakeImageLoaderHolder
 import io.element.android.libraries.push.test.notifications.push.FakeNotificationBitmapLoader
 import io.element.android.tests.testutils.lambda.lambdaRecorder
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
 
-@RunWith(RobolectricTestRunner::class)
-class RingingCallNotificationCreatorTest {
+class RingingCallNotificationCreatorTest : RobolectricTest() {
     @Test
     fun `createNotification - with no associated MatrixClient does nothing`() = runTest {
         val notificationCreator = createRingingCallNotificationCreator(

features/call/impl/src/test/kotlin/io/element/android/features/call/ui/CallDataTest.kt

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2025 New Vector 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.call.ui
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.features.call.api.CallData
+import io.element.android.libraries.matrix.test.A_ROOM_ID
+import io.element.android.libraries.matrix.test.A_SESSION_ID
+import org.junit.Test
+
+class CallDataTest {
+    @Test
+    fun `RoomCall stringification does not contain the URL`() {
+        assertThat(CallData(A_SESSION_ID, A_ROOM_ID, false).toString())
+            .isEqualTo("CallData(sessionId=$A_SESSION_ID, roomId=$A_ROOM_ID, isAudioCall=false)")
+    }
+}

features/call/impl/src/test/kotlin/io/element/android/features/call/ui/CallScreenBackPressPolicyTest.kt

@@ -0,0 +1,96 @@
+/*
+ * 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.call.ui
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.features.call.impl.ui.CallScreenBackPressAction
+import io.element.android.features.call.impl.ui.CallScreenBackPressPolicy
+import org.junit.Test
+
+class CallScreenBackPressPolicyTest {
+    @Test
+    fun `resolve returns dispatch escape when a web view is available and native button is pressed`() {
+        val result = CallScreenBackPressPolicy.resolve(
+            supportPip = false,
+            hasWebView = true,
+            fromNative = true,
+        )
+
+        assertThat(result).isEqualTo(CallScreenBackPressAction.DispatchEscapeToWebView)
+    }
+
+    @Test
+    fun `resolve dispatch escape when there is a web view and pip is supported on native button press`() {
+        val result = CallScreenBackPressPolicy.resolve(
+            supportPip = true,
+            hasWebView = true,
+            fromNative = true,
+        )
+
+        assertThat(result).isEqualTo(CallScreenBackPressAction.DispatchEscapeToWebView)
+    }
+
+    @Test
+    fun `resolve returns hangup when there is no web view and pip is not supported from native button`() {
+        val result = CallScreenBackPressPolicy.resolve(
+            supportPip = false,
+            hasWebView = false,
+            fromNative = true,
+        )
+
+        assertThat(result).isNull()
+    }
+
+    @Test
+    fun `resolve returns hangup when there is no web view even though pip is supported from native button`() {
+        val result = CallScreenBackPressPolicy.resolve(
+            supportPip = true,
+            hasWebView = false,
+            fromNative = true,
+        )
+
+        assertThat(result).isNull()
+    }
+
+    @Test
+    fun `resolve goes to pip if its not from native but from the webview`() {
+        val result = CallScreenBackPressPolicy.resolve(
+            supportPip = true,
+            hasWebView = true,
+            fromNative = false,
+        )
+
+        assertThat(result).isEqualTo(CallScreenBackPressAction.EnterPictureInPicture)
+    }
+    @Test
+    fun `resolve hangs up if its not from native but from the webview and pip is not supported`() {
+        val result = CallScreenBackPressPolicy.resolve(
+            supportPip = false,
+            hasWebView = true,
+            fromNative = false,
+        )
+
+        assertThat(result).isNull()
+    }
+
+    @Test
+    fun `invalid cases (event comes from webview but there is now webview) all result in hangup`() {
+        val withPipSupport = CallScreenBackPressPolicy.resolve(
+            supportPip = true,
+            hasWebView = false,
+            fromNative = false,
+        )
+        assertThat(withPipSupport).isNull()
+        val withOutPipSupport = CallScreenBackPressPolicy.resolve(
+            supportPip = false,
+            hasWebView = false,
+            fromNative = false,
+        )
+        assertThat(withOutPipSupport).isNull()
+    }
+}

features/call/impl/src/test/kotlin/io/element/android/features/call/ui/CallScreenPresenterTest.kt

@@ -13,8 +13,8 @@ import app.cash.molecule.moleculeFlow
 import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
 import im.vector.app.features.analytics.plan.MobileScreen
-import io.element.android.features.call.api.CallType
-import io.element.android.features.call.impl.ui.CallScreenEvents
+import io.element.android.features.call.api.CallData
+import io.element.android.features.call.impl.ui.CallScreenEvent
 import io.element.android.features.call.impl.ui.CallScreenNavigator
 import io.element.android.features.call.impl.ui.CallScreenPresenter
 import io.element.android.features.call.impl.utils.WidgetMessageSerializer
@@ -39,6 +39,7 @@ import io.element.android.services.toolbox.api.systemclock.SystemClock
 import io.element.android.tests.testutils.WarmUpRule
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 import io.element.android.tests.testutils.lambda.value
+import io.element.android.tests.testutils.test
 import io.element.android.tests.testutils.testCoroutineDispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.cancelAndJoin
@@ -59,46 +60,19 @@ class CallScreenPresenterTest {
     val warmUpRule = WarmUpRule()
 
     @Test
-    fun `present - with CallType ExternalUrl just loads the URL and sets the call as active`() = runTest {
-        val analyticsLambda = lambdaRecorder<MobileScreen.ScreenName, Unit> {}
-        val joinedCallLambda = lambdaRecorder<CallType, Unit> {}
-        val presenter = createCallScreenPresenter(
-            callType = CallType.ExternalUrl("https://call.element.io"),
-            screenTracker = FakeScreenTracker(analyticsLambda),
-            activeCallManager = FakeActiveCallManager(joinedCallResult = joinedCallLambda),
-        )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
-            // Wait until the URL is loaded
-            advanceTimeBy(1.seconds)
-            skipItems(2)
-            val initialState = awaitItem()
-            assertThat(initialState.urlState).isEqualTo(AsyncData.Success("https://call.element.io"))
-            assertThat(initialState.webViewError).isNull()
-            assertThat(initialState.isInWidgetMode).isFalse()
-            assertThat(initialState.isCallActive).isFalse()
-            analyticsLambda.assertions().isNeverCalled()
-            joinedCallLambda.assertions().isCalledOnce()
-        }
-    }
-
-    @Test
-    fun `present - with CallType RoomCall sets call as active, loads URL and runs WidgetDriver`() = runTest {
+    fun `present - with CallData sets call as active, loads URL and runs WidgetDriver`() = runTest {
         val widgetDriver = FakeMatrixWidgetDriver()
         val widgetProvider = FakeCallWidgetProvider(widgetDriver)
         val analyticsLambda = lambdaRecorder<MobileScreen.ScreenName, Unit> {}
-        val joinedCallLambda = lambdaRecorder<CallType, Unit> {}
+        val joinedCallLambda = lambdaRecorder<CallData, Unit> {}
         val presenter = createCallScreenPresenter(
-            callType = CallType.RoomCall(A_SESSION_ID, A_ROOM_ID, false),
+            callData = CallData(A_SESSION_ID, A_ROOM_ID, false),
             widgetDriver = widgetDriver,
             widgetProvider = widgetProvider,
             screenTracker = FakeScreenTracker(analyticsLambda),
             activeCallManager = FakeActiveCallManager(joinedCallResult = joinedCallLambda),
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             // Wait until the URL is loaded
             advanceTimeBy(1.seconds)
             skipItems(1)
@@ -107,7 +81,6 @@ class CallScreenPresenterTest {
             val initialState = awaitItem()
             assertThat(initialState.urlState).isInstanceOf(AsyncData.Loading::class.java)
             assertThat(initialState.isCallActive).isFalse()
-            assertThat(initialState.isInWidgetMode).isTrue()
             assertThat(widgetProvider.getWidgetCalled).isTrue()
             assertThat(widgetDriver.runCalledCount).isEqualTo(1)
             analyticsLambda.assertions().isCalledOnce().with(value(MobileScreen.ScreenName.RoomCall))
@@ -123,19 +96,17 @@ class CallScreenPresenterTest {
     fun `present - set message interceptor, send and receive messages`() = runTest {
         val widgetDriver = FakeMatrixWidgetDriver()
         val presenter = createCallScreenPresenter(
-            callType = CallType.RoomCall(A_SESSION_ID, A_ROOM_ID, false),
+            callData = CallData(A_SESSION_ID, A_ROOM_ID, false),
             widgetDriver = widgetDriver,
             screenTracker = FakeScreenTracker {},
         )
         val messageInterceptor = FakeWidgetMessageInterceptor()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             // Give it time to load the URL and WidgetDriver
             advanceTimeBy(1.seconds)
 
             val initialState = awaitItem()
-            initialState.eventSink(CallScreenEvents.SetupMessageChannels(messageInterceptor))
+            initialState.eventSink(CallScreenEvent.SetupMessageChannels(messageInterceptor))
 
             // And incoming message from the Widget Driver is passed to the WebView
             widgetDriver.givenIncomingMessage("A message")
@@ -154,24 +125,22 @@ class CallScreenPresenterTest {
         val navigator = FakeCallScreenNavigator()
         val widgetDriver = FakeMatrixWidgetDriver()
         val presenter = createCallScreenPresenter(
-            callType = CallType.RoomCall(A_SESSION_ID, A_ROOM_ID, false),
+            callData = CallData(A_SESSION_ID, A_ROOM_ID, false),
             widgetDriver = widgetDriver,
             navigator = navigator,
             dispatchers = testCoroutineDispatchers(useUnconfinedTestDispatcher = true),
             screenTracker = FakeScreenTracker {},
         )
         val messageInterceptor = FakeWidgetMessageInterceptor()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
 
             // Give it time to load the URL and WidgetDriver
             advanceTimeBy(1.seconds)
 
-            initialState.eventSink(CallScreenEvents.SetupMessageChannels(messageInterceptor))
+            initialState.eventSink(CallScreenEvent.SetupMessageChannels(messageInterceptor))
 
-            initialState.eventSink(CallScreenEvents.Hangup)
+            initialState.eventSink(CallScreenEvent.Hangup)
 
             // Let background coroutines run and the widget drive be received
             runCurrent()
@@ -188,22 +157,20 @@ class CallScreenPresenterTest {
         val navigator = FakeCallScreenNavigator()
         val widgetDriver = FakeMatrixWidgetDriver()
         val presenter = createCallScreenPresenter(
-            callType = CallType.RoomCall(A_SESSION_ID, A_ROOM_ID, false),
+            callData = CallData(A_SESSION_ID, A_ROOM_ID, false),
             widgetDriver = widgetDriver,
             navigator = navigator,
             dispatchers = testCoroutineDispatchers(useUnconfinedTestDispatcher = true),
             screenTracker = FakeScreenTracker {},
         )
         val messageInterceptor = FakeWidgetMessageInterceptor()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
 
             // Give it time to load the URL and WidgetDriver
             advanceTimeBy(1.seconds)
 
-            initialState.eventSink(CallScreenEvents.SetupMessageChannels(messageInterceptor))
+            initialState.eventSink(CallScreenEvent.SetupMessageChannels(messageInterceptor))
 
             messageInterceptor.givenInterceptedMessage("""{"action":"io.element.close","api":"fromWidget","widgetId":"1","requestId":"1"}""")
 
@@ -223,22 +190,20 @@ class CallScreenPresenterTest {
         val navigator = FakeCallScreenNavigator()
         val widgetDriver = FakeMatrixWidgetDriver()
         val presenter = createCallScreenPresenter(
-            callType = CallType.RoomCall(A_SESSION_ID, A_ROOM_ID, false),
+            callData = CallData(A_SESSION_ID, A_ROOM_ID, false),
             widgetDriver = widgetDriver,
             navigator = navigator,
             dispatchers = testCoroutineDispatchers(useUnconfinedTestDispatcher = true),
             screenTracker = FakeScreenTracker {},
         )
         val messageInterceptor = FakeWidgetMessageInterceptor()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             // Give it time to load the URL and WidgetDriver
             advanceTimeBy(1.seconds)
             skipItems(2)
             val initialState = awaitItem()
             assertThat(initialState.isCallActive).isFalse()
-            initialState.eventSink(CallScreenEvents.SetupMessageChannels(messageInterceptor))
+            initialState.eventSink(CallScreenEvent.SetupMessageChannels(messageInterceptor))
             messageInterceptor.givenInterceptedMessage(
                 """
                     {
@@ -260,22 +225,20 @@ class CallScreenPresenterTest {
         val navigator = FakeCallScreenNavigator()
         val widgetDriver = FakeMatrixWidgetDriver()
         val presenter = createCallScreenPresenter(
-            callType = CallType.RoomCall(A_SESSION_ID, A_ROOM_ID, false),
+            callData = CallData(A_SESSION_ID, A_ROOM_ID, false),
             widgetDriver = widgetDriver,
             navigator = navigator,
             dispatchers = testCoroutineDispatchers(useUnconfinedTestDispatcher = true),
             screenTracker = FakeScreenTracker {},
         )
         val messageInterceptor = FakeWidgetMessageInterceptor()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             // Give it time to load the URL and WidgetDriver
             advanceTimeBy(1.seconds)
             skipItems(2)
             val initialState = awaitItem()
             assertThat(initialState.isCallActive).isFalse()
-            initialState.eventSink(CallScreenEvents.SetupMessageChannels(messageInterceptor))
+            initialState.eventSink(CallScreenEvent.SetupMessageChannels(messageInterceptor))
             skipItems(2)
 
             // Wait for the timeout to trigger
@@ -300,7 +263,7 @@ class CallScreenPresenterTest {
         val matrixClient = FakeMatrixClient(syncService = syncService)
         val appForegroundStateService = FakeAppForegroundStateService()
         val presenter = createCallScreenPresenter(
-            callType = CallType.RoomCall(A_SESSION_ID, A_ROOM_ID, false),
+            callData = CallData(A_SESSION_ID, A_ROOM_ID, false),
             widgetDriver = widgetDriver,
             navigator = navigator,
             dispatchers = testCoroutineDispatchers(useUnconfinedTestDispatcher = true),
@@ -338,53 +301,8 @@ class CallScreenPresenterTest {
         }
     }
 
-    @Test
-    fun `present - error from WebView are updating the state`() = runTest {
-        val presenter = createCallScreenPresenter(
-            callType = CallType.ExternalUrl("https://call.element.io"),
-            activeCallManager = FakeActiveCallManager(),
-        )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
-            // Wait until the URL is loaded
-            advanceTimeBy(1.seconds)
-            skipItems(2)
-            val initialState = awaitItem()
-            initialState.eventSink(CallScreenEvents.OnWebViewError("A Webview error"))
-            val finalState = awaitItem()
-            assertThat(finalState.webViewError).isEqualTo("A Webview error")
-        }
-    }
-
-    @Test
-    fun `present - error from WebView are ignored if Element Call is loaded`() = runTest {
-        val presenter = createCallScreenPresenter(
-            callType = CallType.ExternalUrl("https://call.element.io"),
-            activeCallManager = FakeActiveCallManager(),
-        )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
-            // Wait until the URL is loaded
-            skipItems(1)
-            val initialState = awaitItem()
-
-            val messageInterceptor = FakeWidgetMessageInterceptor()
-            initialState.eventSink(CallScreenEvents.SetupMessageChannels(messageInterceptor))
-            // Emit a message
-            messageInterceptor.givenInterceptedMessage("A message")
-            // WebView emits an error, but it will be ignored
-            initialState.eventSink(CallScreenEvents.OnWebViewError("A Webview error"))
-            val finalState = awaitItem()
-            assertThat(finalState.webViewError).isNull()
-
-            cancelAndIgnoreRemainingEvents()
-        }
-    }
-
     private fun TestScope.createCallScreenPresenter(
-        callType: CallType,
+        callData: CallData,
         navigator: CallScreenNavigator = FakeCallScreenNavigator(),
         widgetDriver: FakeMatrixWidgetDriver = FakeMatrixWidgetDriver(),
         widgetProvider: FakeCallWidgetProvider = FakeCallWidgetProvider(widgetDriver),
@@ -401,7 +319,7 @@ class CallScreenPresenterTest {
         }
         val clock = SystemClock { 0 }
         return CallScreenPresenter(
-            callType = callType,
+            callData = callData,
             navigator = navigator,
             callWidgetProvider = widgetProvider,
             userAgentProvider = userAgentProvider,

features/call/impl/src/test/kotlin/io/element/android/features/call/ui/CallScreenViewTest.kt

@@ -0,0 +1,149 @@
+/*
+ * 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.call.ui
+
+import android.view.KeyEvent
+import android.webkit.WebView
+import androidx.activity.ComponentActivity
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.ui.platform.LocalInspectionMode
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
+import io.element.android.features.call.impl.pip.PictureInPictureEvent
+import io.element.android.features.call.impl.pip.PictureInPictureState
+import io.element.android.features.call.impl.pip.aPictureInPictureState
+import io.element.android.features.call.impl.ui.CallScreenEvent
+import io.element.android.features.call.impl.ui.CallScreenState
+import io.element.android.features.call.impl.ui.CallScreenView
+import io.element.android.features.call.impl.ui.JavascriptBackHandlerBridge
+import io.element.android.features.call.impl.ui.aCallScreenState
+import io.element.android.tests.testutils.EventsRecorder
+import io.element.android.tests.testutils.pressBackKey
+import io.element.android.tests.testutils.robolectric.RobolectricTest
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.robolectric.annotation.Config
+import org.robolectric.annotation.Implementation
+import org.robolectric.annotation.Implements
+import org.robolectric.annotation.Resetter
+import org.robolectric.shadows.ShadowWebView
+
+@OptIn(ExperimentalTestApi::class)
+class CallScreenViewTest : RobolectricTest() {
+    @Test
+    fun `pressing back key triggers hangup when no web view is available and pip is unsupported`() = runAndroidComposeUiTest {
+        val callEvents = EventsRecorder<CallScreenEvent>()
+
+        setCallScreenView(
+            state = aCallScreenState(eventSink = callEvents),
+            useInspectionMode = true,
+        )
+
+        pressBackKey()
+
+        callEvents.assertEmpty()
+    }
+
+    @Config(shadows = [RecordingShadowWebView::class])
+    @Test
+    fun `pressing back key dispatches escape key events to web view when pip is unsupported`() = runAndroidComposeUiTest {
+        setCallScreenView(
+            state = aCallScreenState(),
+            useInspectionMode = false,
+            pipState = aPictureInPictureState(supportPip = false),
+        )
+
+        pressBackKey()
+
+        val dispatchedEvents = RecordingShadowWebView.dispatchedEvents
+        assertEquals(2, dispatchedEvents.size)
+        assertEquals(KeyEvent.ACTION_DOWN, dispatchedEvents[0].action)
+        assertEquals(KeyEvent.KEYCODE_ESCAPE, dispatchedEvents[0].keyCode)
+        assertEquals(KeyEvent.ACTION_UP, dispatchedEvents[1].action)
+        assertEquals(KeyEvent.KEYCODE_ESCAPE, dispatchedEvents[1].keyCode)
+    }
+
+    @Config(shadows = [RecordingShadowWebView::class])
+    @Test
+    fun `web view javascript back handler emits pip event when pip is supported`() = runAndroidComposeUiTest {
+        val pipEvents = EventsRecorder<PictureInPictureEvent>()
+
+        setCallScreenView(
+            state = aCallScreenState(),
+            useInspectionMode = false,
+            pipState = aPictureInPictureState(
+                supportPip = true,
+                eventSink = pipEvents,
+            ),
+        )
+
+        runOnIdle {
+            RecordingShadowWebView.invokeJavascriptBackHandler()
+        }
+
+        pipEvents.assertSize(2)
+        pipEvents.assertTrue(0) { it is PictureInPictureEvent.SetPipController }
+        pipEvents.assertTrue(1) { it is PictureInPictureEvent.EnterPictureInPicture }
+    }
+}
+
+@OptIn(ExperimentalTestApi::class)
+private fun <A : ComponentActivity> AndroidComposeUiTest<A>.setCallScreenView(
+    state: CallScreenState,
+    useInspectionMode: Boolean,
+    pipState: PictureInPictureState = aPictureInPictureState(supportPip = false),
+) {
+    setContent {
+        // Inspection mode disables AndroidView creation; keep it configurable per test.
+        CompositionLocalProvider(LocalInspectionMode provides useInspectionMode) {
+            CallScreenView(
+                state = state,
+                pipState = pipState,
+                onConsoleMessage = {},
+                requestPermissions = { _, _ -> },
+            )
+        }
+    }
+}
+
+@Implements(WebView::class)
+internal class RecordingShadowWebView : ShadowWebView() {
+    companion object {
+        val dispatchedEvents = mutableListOf<KeyEvent>()
+        private var backHandlerJavascriptInterface: JavascriptBackHandlerBridge? = null
+
+        @Resetter
+        @JvmStatic
+        @Suppress("unused")
+        fun resetRecordedEvents() {
+            dispatchedEvents.clear()
+            backHandlerJavascriptInterface = null
+        }
+
+        fun invokeJavascriptBackHandler() {
+            val backHandler = checkNotNull(backHandlerJavascriptInterface) { "Expected backHandler JavaScript interface to be registered" }
+            backHandler.onBackPressed()
+        }
+    }
+
+    @Implementation
+    protected override fun addJavascriptInterface(`object`: Any, name: String) {
+        super.addJavascriptInterface(`object`, name)
+        if (name == "backHandler") {
+            backHandlerJavascriptInterface = `object` as? JavascriptBackHandlerBridge
+        }
+    }
+
+    @Implementation
+    @Suppress("unused")
+    fun dispatchKeyEvent(event: KeyEvent): Boolean {
+        dispatchedEvents += KeyEvent(event)
+        return false
+    }
+}

features/call/impl/src/test/kotlin/io/element/android/features/call/ui/CallTypeTest.kt

@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2025 New Vector 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.call.ui
-
-import com.google.common.truth.Truth.assertThat
-import io.element.android.features.call.api.CallType
-import io.element.android.features.call.impl.ui.getSessionId
-import io.element.android.libraries.matrix.test.A_ROOM_ID
-import io.element.android.libraries.matrix.test.A_SESSION_ID
-import org.junit.Test
-
-class CallTypeTest {
-    @Test
-    fun `getSessionId returns null for ExternalUrl`() {
-        assertThat(CallType.ExternalUrl("aURL").getSessionId()).isNull()
-    }
-
-    @Test
-    fun `getSessionId returns the sessionId for RoomCall`() {
-        assertThat(
-            CallType.RoomCall(
-                sessionId = A_SESSION_ID,
-                roomId = A_ROOM_ID,
-                isAudioCall = false,
-            ).getSessionId()
-        ).isEqualTo(A_SESSION_ID)
-    }
-
-    @Test
-    fun `ExternalUrl stringification does not contain the URL`() {
-        assertThat(CallType.ExternalUrl("aURL").toString()).isEqualTo("ExternalUrl")
-    }
-
-    @Test
-    fun `RoomCall stringification does not contain the URL`() {
-        assertThat(CallType.RoomCall(A_SESSION_ID, A_ROOM_ID, false).toString())
-            .isEqualTo("RoomCall(sessionId=$A_SESSION_ID, roomId=$A_ROOM_ID, isAudioCall=false)")
-    }
-}

features/call/impl/src/test/kotlin/io/element/android/features/call/utils/CallIntentDataParserTest.kt

@@ -1,226 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2023-2025 New Vector 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.call.utils
-
-import com.google.common.truth.Truth.assertThat
-import io.element.android.features.call.impl.utils.CallIntentDataParser
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
-import java.net.URLEncoder
-
-@RunWith(RobolectricTestRunner::class)
-class CallIntentDataParserTest {
-    private val callIntentDataParser = CallIntentDataParser()
-
-    @Test
-    fun `a null data returns null`() {
-        val url: String? = null
-        assertThat(callIntentDataParser.parse(url)).isNull()
-    }
-
-    @Test
-    fun `empty data returns null`() {
-        doTest("", null)
-    }
-
-    @Test
-    fun `invalid data returns null`() {
-        doTest("!", null)
-    }
-
-    @Test
-    fun `data with no scheme returns null`() {
-        doTest("test", null)
-    }
-
-    @Test
-    fun `Element Call http urls returns null`() {
-        doTest("http://call.element.io", null)
-        doTest("http://call.element.io/some-actual-call?with=parameters", null)
-    }
-
-    @Test
-    fun `Element Call urls with unknown host returns null`() {
-        // Check valid host first, should not return null
-        doTest("https://call.element.io", "https://call.element.io#?appPrompt=false&confineToRoom=true")
-        // Unknown host should return null
-        doTest("https://unknown.io", null)
-        doTest("https://call.unknown.io", null)
-        doTest("https://call.element.com", null)
-        doTest("https://call.element.io.tld", null)
-    }
-
-    @Test
-    fun `Element Call urls will be returned as is`() {
-        doTest(
-            url = "https://call.element.io",
-            expectedResult = "https://call.element.io#?$EXTRA_PARAMS"
-        )
-    }
-
-    @Test
-    fun `Element Call url with url param gets url extracted`() {
-        doTest(
-            url = VALID_CALL_URL_WITH_PARAM,
-            expectedResult = "$VALID_CALL_URL_WITH_PARAM#?$EXTRA_PARAMS"
-        )
-    }
-
-    @Test
-    fun `HTTP and HTTPS urls that don't come from EC return null`() {
-        doTest("http://app.element.io", null)
-        doTest("https://app.element.io", null)
-        doTest("http://", null)
-        doTest("https://", null)
-    }
-
-    @Test
-    fun `Element Call url with no url returns null`() {
-        val embeddedUrl = VALID_CALL_URL_WITH_PARAM
-        val encodedUrl = URLEncoder.encode(embeddedUrl, "utf-8")
-        val url = "io.element.call:/?no_url=$encodedUrl"
-        assertThat(callIntentDataParser.parse(url)).isNull()
-    }
-
-    @Test
-    fun `element scheme with no call host returns null`() {
-        val embeddedUrl = VALID_CALL_URL_WITH_PARAM
-        val encodedUrl = URLEncoder.encode(embeddedUrl, "utf-8")
-        val url = "element://no-call?url=$encodedUrl"
-        assertThat(callIntentDataParser.parse(url)).isNull()
-    }
-
-    @Test
-    fun `element scheme with no data returns null`() {
-        val url = "element://call?url="
-        assertThat(callIntentDataParser.parse(url)).isNull()
-    }
-
-    @Test
-    fun `Element Call url with no data returns null`() {
-        val url = "io.element.call:/?url="
-        assertThat(callIntentDataParser.parse(url)).isNull()
-    }
-
-    @Test
-    fun `element invalid scheme returns null`() {
-        val embeddedUrl = VALID_CALL_URL_WITH_PARAM
-        val encodedUrl = URLEncoder.encode(embeddedUrl, "utf-8")
-        val url = "bad.scheme:/?url=$encodedUrl"
-        assertThat(callIntentDataParser.parse(url)).isNull()
-    }
-
-    @Test
-    fun `Element Call url with url extra param appPrompt gets url extracted`() {
-        doTest(
-            url = "$VALID_CALL_URL_WITH_PARAM&appPrompt=true",
-            expectedResult = "$VALID_CALL_URL_WITH_PARAM#?$EXTRA_PARAMS"
-        )
-    }
-
-    @Test
-    fun `Element Call url with url extra param in fragment appPrompt gets url extracted`() {
-        doTest(
-            url = "$VALID_CALL_URL_WITH_PARAM#?appPrompt=true",
-            expectedResult = "$VALID_CALL_URL_WITH_PARAM#?appPrompt=false&confineToRoom=true"
-        )
-    }
-
-    @Test
-    fun `Element Call url with url extra param in fragment appPrompt and other gets url extracted`() {
-        doTest(
-            url = "$VALID_CALL_URL_WITH_PARAM#?appPrompt=true&otherParam=maybe",
-            expectedResult = "$VALID_CALL_URL_WITH_PARAM#?appPrompt=false&otherParam=maybe&confineToRoom=true"
-        )
-    }
-
-    @Test
-    fun `Element Call url with url extra param confineToRoom gets url extracted`() {
-        doTest(
-            url = "$VALID_CALL_URL_WITH_PARAM&confineToRoom=false",
-            expectedResult = "$VALID_CALL_URL_WITH_PARAM#?$EXTRA_PARAMS"
-        )
-    }
-
-    @Test
-    fun `Element Call url with url extra param in fragment confineToRoom gets url extracted`() {
-        doTest(
-            url = "$VALID_CALL_URL_WITH_PARAM#?confineToRoom=false",
-            expectedResult = "$VALID_CALL_URL_WITH_PARAM#?confineToRoom=true&appPrompt=false"
-        )
-    }
-
-    @Test
-    fun `Element Call url with url extra param in fragment confineToRoom and more gets url extracted`() {
-        doTest(
-            url = "$VALID_CALL_URL_WITH_PARAM#?confineToRoom=false&otherParam=maybe",
-            expectedResult = "$VALID_CALL_URL_WITH_PARAM#?confineToRoom=true&otherParam=maybe&appPrompt=false"
-        )
-    }
-
-    @Test
-    fun `Element Call url with url fragment gets url extracted`() {
-        doTest(
-            url = "$VALID_CALL_URL_WITH_PARAM#fragment",
-            expectedResult = "$VALID_CALL_URL_WITH_PARAM#fragment?$EXTRA_PARAMS"
-        )
-    }
-
-    @Test
-    fun `Element Call url with url fragment with params gets url extracted`() {
-        doTest(
-            url = "$VALID_CALL_URL_WITH_PARAM#fragment?otherParam=maybe",
-            expectedResult = "$VALID_CALL_URL_WITH_PARAM#fragment?otherParam=maybe&$EXTRA_PARAMS"
-        )
-    }
-
-    @Test
-    fun `Element Call url with url fragment with other params gets url extracted`() {
-        doTest(
-            url = "$VALID_CALL_URL_WITH_PARAM#?otherParam=maybe",
-            expectedResult = "$VALID_CALL_URL_WITH_PARAM#?otherParam=maybe&$EXTRA_PARAMS"
-        )
-    }
-
-    @Test
-    fun `Element Call url with empty fragment`() {
-        doTest(
-            url = "$VALID_CALL_URL_WITH_PARAM#",
-            expectedResult = "$VALID_CALL_URL_WITH_PARAM#?$EXTRA_PARAMS"
-        )
-    }
-
-    @Test
-    fun `Element Call url with empty fragment query`() {
-        doTest(
-            url = "$VALID_CALL_URL_WITH_PARAM#?",
-            expectedResult = "$VALID_CALL_URL_WITH_PARAM#?$EXTRA_PARAMS"
-        )
-    }
-
-    private fun doTest(url: String, expectedResult: String?) {
-        // Test direct parsing
-        assertThat(callIntentDataParser.parse(url)).isEqualTo(expectedResult)
-
-        // Test embedded url, scheme 1
-        val encodedUrl = URLEncoder.encode(url, "utf-8")
-        val urlScheme1 = "element://call?url=$encodedUrl"
-        assertThat(callIntentDataParser.parse(urlScheme1)).isEqualTo(expectedResult)
-
-        // Test embedded url, scheme 2
-        val urlScheme2 = "io.element.call:/?url=$encodedUrl"
-        assertThat(callIntentDataParser.parse(urlScheme2)).isEqualTo(expectedResult)
-    }
-
-    companion object {
-        const val VALID_CALL_URL_WITH_PARAM = "https://call.element.io/some-actual-call?with=parameters"
-        const val EXTRA_PARAMS = "appPrompt=false&confineToRoom=true"
-    }
-}