Add history sharing badges to room details (#6132)

* feat: Add history sharing badges to room details view * tests: Add snapshots for history sharing room details badges * fix: Disable soft-wrapping in badges, use FlowRow * tests: Add unit test for `RoomDetailsState` and history sharing badges. * tests: Add `MatrixBadgeAtomNeutralWrappingPreview` to exceptions * chore: Re-order `MatrixBadgeAtom` previews * fix: Add `Immutable` annotation to `RoomHistoryVisibility`. * fix: Correct translation for shared badge
2026-02-06 19:03:52 +00:00 · 2026-02-06 19:03:52 +00:00 · 1e268b0709
commit 1e268b0709
parent 26de441215
20 changed files with 156 additions and 3 deletions
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenter.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenter.kt
@ -168,6 +168,8 @@ class RoomDetailsPresenter(

        val canReportRoom by produceState(false) { value = client.canReportRoom() }

+        val enableKeyShareOnInvite by featureFlagService.isFeatureEnabledFlow(FeatureFlags.EnableKeyShareOnInvite).collectAsState(initial = false)
+
        return RoomDetailsState(
            roomId = room.roomId,
            roomName = roomName,
@ -197,6 +199,8 @@ class RoomDetailsPresenter(
            isTombstoned = roomInfo.successorRoom != null,
            showDebugInfo = isDeveloperModeEnabled,
            roomVersion = roomInfo.roomVersion,
+            enableKeyShareOnInvite = enableKeyShareOnInvite,
+            roomHistoryVisibility = roomInfo.historyVisibility,
            eventSink = ::handleEvent,
        )
    }
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsState.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsState.kt
@ -17,6 +17,7 @@ import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.RoomNotificationSettings
+import io.element.android.libraries.matrix.api.room.history.RoomHistoryVisibility
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
@ -50,6 +51,8 @@ data class RoomDetailsState(
    val isTombstoned: Boolean,
    val showDebugInfo: Boolean,
    val roomVersion: String?,
+    val enableKeyShareOnInvite: Boolean,
+    val roomHistoryVisibility: RoomHistoryVisibility,
    val eventSink: (RoomDetailsEvent) -> Unit
 ) {
    val roomBadges = buildList {
@ -61,6 +64,14 @@ data class RoomDetailsState(
        if (isPublic) {
            add(RoomBadge.PUBLIC)
        }
+        if (enableKeyShareOnInvite && isEncrypted) {
+            when (roomHistoryVisibility) {
+                RoomHistoryVisibility.Invited, RoomHistoryVisibility.Joined -> add(RoomBadge.SHARED_HISTORY_HIDDEN)
+                RoomHistoryVisibility.Shared -> add(RoomBadge.SHARED_HISTORY_SHARED)
+                RoomHistoryVisibility.WorldReadable -> add(RoomBadge.SHARED_HISTORY_WORLD_READABLE)
+                else -> {}
+            }
+        }
    }.toImmutableList()
 }

@ -84,4 +95,7 @@ enum class RoomBadge {
    ENCRYPTED,
    NOT_ENCRYPTED,
    PUBLIC,
+    SHARED_HISTORY_HIDDEN,
+    SHARED_HISTORY_SHARED,
+    SHARED_HISTORY_WORLD_READABLE
 }
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsStateProvider.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsStateProvider.kt
@ -26,6 +26,7 @@ import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.RoomMembershipState
 import io.element.android.libraries.matrix.api.room.RoomNotificationMode
 import io.element.android.libraries.matrix.api.room.RoomNotificationSettings
+import io.element.android.libraries.matrix.api.room.history.RoomHistoryVisibility
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.matrix.ui.components.aMatrixUserList
 import kotlinx.collections.immutable.toImmutableList
@ -57,6 +58,9 @@ open class RoomDetailsStateProvider : PreviewParameterProvider<RoomDetailsState>
            aRoomDetailsState(isTombstoned = true),
            aDmRoomDetailsState(dmRoomMemberVerificationState = UserProfileVerificationState.VERIFIED),
            aDmRoomDetailsState(dmRoomMemberVerificationState = UserProfileVerificationState.VERIFICATION_VIOLATION),
+            aSharedHistoryRoomDetailsState(roomHistoryVisibility = RoomHistoryVisibility.Joined),
+            aSharedHistoryRoomDetailsState(roomHistoryVisibility = RoomHistoryVisibility.Shared),
+            aSharedHistoryRoomDetailsState(roomHistoryVisibility = RoomHistoryVisibility.WorldReadable),
            // Add other state here
        )
 }
@ -117,6 +121,8 @@ fun aRoomDetailsState(
    canReportRoom: Boolean = true,
    isTombstoned: Boolean = false,
    showDebugInfo: Boolean = false,
+    enableKeyShareOnInvite: Boolean = false,
+    roomHistoryVisibility: RoomHistoryVisibility = RoomHistoryVisibility.Shared,
    eventSink: (RoomDetailsEvent) -> Unit = {},
 ) = RoomDetailsState(
    roomId = roomId,
@ -147,6 +153,8 @@ fun aRoomDetailsState(
    isTombstoned = isTombstoned,
    showDebugInfo = showDebugInfo,
    roomVersion = "12",
+    enableKeyShareOnInvite = enableKeyShareOnInvite,
+    roomHistoryVisibility = roomHistoryVisibility,
    eventSink = eventSink,
 )

@ -182,3 +190,11 @@ fun aDmRoomDetailsState(
        verificationState = dmRoomMemberVerificationState,
    )
 )
+
+fun aSharedHistoryRoomDetailsState(
+    roomHistoryVisibility: RoomHistoryVisibility
+) = aRoomDetailsState(
+    isEncrypted = true,
+    enableKeyShareOnInvite = true,
+    roomHistoryVisibility = roomHistoryVisibility,
+)
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt
@ -518,6 +518,27 @@ private fun RoomBadge.toMatrixBadgeData(): MatrixBadgeAtom.MatrixBadgeData {
                type = MatrixBadgeAtom.Type.Info,
            )
        }
+        RoomBadge.SHARED_HISTORY_HIDDEN -> {
+            MatrixBadgeAtom.MatrixBadgeData(
+                text = stringResource(R.string.crypto_history_sharing_room_info_hidden_badge_content),
+                icon = CompoundIcons.VisibilityOff(),
+                type = MatrixBadgeAtom.Type.Info
+            )
+        }
+        RoomBadge.SHARED_HISTORY_SHARED -> {
+            MatrixBadgeAtom.MatrixBadgeData(
+                text = stringResource(R.string.crypto_history_sharing_room_info_shared_badge_content),
+                icon = CompoundIcons.History(),
+                type = MatrixBadgeAtom.Type.Info
+            )
+        }
+        RoomBadge.SHARED_HISTORY_WORLD_READABLE -> {
+            MatrixBadgeAtom.MatrixBadgeData(
+                text = stringResource(R.string.crypto_history_sharing_room_info_world_readable_badge_content),
+                icon = CompoundIcons.UserProfileSolid(),
+                type = MatrixBadgeAtom.Type.Info
+            )
+        }
    }
 }

--- a/features/roomdetails/impl/src/main/res/values/localazy.xml
+++ b/features/roomdetails/impl/src/main/res/values/localazy.xml
@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="crypto_history_sharing_room_info_hidden_badge_content">"New members don\'t see history"</string>
+  <string name="crypto_history_sharing_room_info_shared_badge_content">"New members see history"</string>
+  <string name="crypto_history_sharing_room_info_world_readable_badge_content">"Anyone can see history"</string>
  <string name="screen_edit_room_address_room_address_section_footer">"You’ll need an address in order to make it visible in the public directory."</string>
  <string name="screen_edit_room_address_title">"Edit address"</string>
  <string name="screen_notification_settings_edit_failed_updating_default_mode">"An error occurred while updating the notification setting."</string>
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsStateTest.kt
+++ b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsStateTest.kt
@ -9,6 +9,7 @@
 package io.element.android.features.roomdetails.impl

 import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.matrix.api.room.history.RoomHistoryVisibility
 import kotlinx.collections.immutable.persistentListOf
 import org.junit.Test

@ -56,4 +57,52 @@ class RoomDetailsStateTest {
            persistentListOf(RoomBadge.ENCRYPTED)
        )
    }
+
+    @Test
+    fun `room public not encrypted should not have history sharing badges`() {
+        val sut = aRoomDetailsState(
+            isEncrypted = false,
+            enableKeyShareOnInvite = true,
+            roomHistoryVisibility = RoomHistoryVisibility.Shared
+        )
+        assertThat(sut.roomBadges).isEqualTo(
+            persistentListOf(RoomBadge.NOT_ENCRYPTED, RoomBadge.PUBLIC)
+        )
+    }
+
+    @Test
+    fun `room public encrypted should have history sharing hidden badge`() {
+        val sut = aRoomDetailsState(
+            isEncrypted = true,
+            enableKeyShareOnInvite = true,
+            roomHistoryVisibility = RoomHistoryVisibility.Joined
+        )
+        assertThat(sut.roomBadges).isEqualTo(
+            persistentListOf(RoomBadge.ENCRYPTED, RoomBadge.PUBLIC, RoomBadge.SHARED_HISTORY_HIDDEN)
+        )
+    }
+
+    @Test
+    fun `room public encrypted should have history sharing shared badge`() {
+        val sut = aRoomDetailsState(
+            isEncrypted = true,
+            enableKeyShareOnInvite = true,
+            roomHistoryVisibility = RoomHistoryVisibility.Shared
+        )
+        assertThat(sut.roomBadges).isEqualTo(
+            persistentListOf(RoomBadge.ENCRYPTED, RoomBadge.PUBLIC, RoomBadge.SHARED_HISTORY_SHARED)
+        )
+    }
+
+    @Test
+    fun `room public encrypted should have history sharing world_readable badge`() {
+        val sut = aRoomDetailsState(
+            isEncrypted = true,
+            enableKeyShareOnInvite = true,
+            roomHistoryVisibility = RoomHistoryVisibility.WorldReadable
+        )
+        assertThat(sut.roomBadges).isEqualTo(
+            persistentListOf(RoomBadge.ENCRYPTED, RoomBadge.PUBLIC, RoomBadge.SHARED_HISTORY_WORLD_READABLE)
+        )
+    }
 }
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/MatrixBadgeAtom.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/MatrixBadgeAtom.kt
@ -98,6 +98,18 @@ internal fun MatrixBadgeAtomNegativePreview() = ElementPreview {
    )
 }

+@PreviewsDayNight
+@Composable
+internal fun MatrixBadgeAtomNeutralWrappingPreview() = ElementPreview {
+    MatrixBadgeAtom.View(
+        MatrixBadgeAtom.MatrixBadgeData(
+            text = "How much wood could a wood chuck chuck if a wood chuck could chuck wood",
+            icon = CompoundIcons.LockOff(),
+            type = MatrixBadgeAtom.Type.Info,
+        )
+    )
+}
+
@PreviewsDayNight
@Composable
 internal fun MatrixBadgeAtomInfoPreview() = ElementPreview {
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/MatrixBadgeRowMolecule.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/MatrixBadgeRowMolecule.kt
@ -9,9 +9,10 @@
 package io.element.android.libraries.designsystem.atomic.molecules

 import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import io.element.android.libraries.designsystem.atomic.atoms.MatrixBadgeAtom
@ -22,10 +23,11 @@ fun MatrixBadgeRowMolecule(
    data: ImmutableList<MatrixBadgeAtom.MatrixBadgeData>,
    modifier: Modifier = Modifier,
 ) {
-    Row(
+    FlowRow(
        modifier = modifier
            .padding(start = 16.dp, end = 16.dp, top = 8.dp),
-        horizontalArrangement = Arrangement.spacedBy(8.dp),
+        horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.CenterHorizontally),
+        verticalArrangement = Arrangement.spacedBy(8.dp)
    ) {
        for (badge in data) {
            MatrixBadgeAtom.View(badge)
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/Badge.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/Badge.kt
@ -21,6 +21,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.CompoundIcons
@ -63,6 +64,8 @@ fun Badge(
                text = text,
                style = ElementTheme.typography.fontBodySmRegular,
                color = textColor,
+                overflow = TextOverflow.Ellipsis,
+                softWrap = false,
            )
        }
    }
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/history/RoomHistoryVisibility.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/history/RoomHistoryVisibility.kt
@ -8,6 +8,9 @@

 package io.element.android.libraries.matrix.api.room.history

+import androidx.compose.runtime.Immutable
+
+@Immutable
 sealed interface RoomHistoryVisibility {
    /**
     * Previous events are accessible to newly joined members from the point
--- a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistPreviewTest.kt
+++ b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistPreviewTest.kt
@ -97,6 +97,7 @@ class KonsistPreviewTest {
        "MatrixBadgeAtomInfoPreview",
        "MatrixBadgeAtomNegativePreview",
        "MatrixBadgeAtomNeutralPreview",
+        "MatrixBadgeAtomNeutralWrappingPreview",
        "MatrixBadgeAtomPositivePreview",
        "MentionSpanThemeInTimelinePreview",
        "MessageComposerViewVoicePreview",
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_20_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_20_en.png
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d6e25d66cc11378dc63482a8f83aaa73931cb667b77fb49764fa7c9eda7b4a35
+size 45336
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_21_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_21_en.png
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:72ecab2ee0ce79ce67d58238953eaebea7ea250dfb7d507e79b33987f227a7d2
+size 45110
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_22_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_22_en.png
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:490706621022f059c85ddf0a4ad8cbc47d999f7ae5aa10127c38a6d5eef2bb1d
+size 44817
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_20_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_20_en.png
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:57b4ed36a7ba670c91fc3776fce0fa94403519e05f5b6af406dd0b8863af71f9
+size 46258
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_21_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_21_en.png
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a0a10aaccb38d9c29bf8663b55c083b352e0d9ff318883e44446e9e1f7f44d9b
+size 45992
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_22_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_22_en.png
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:688cf3ef22f181e38870028ed4a88ebf77177222a7ccba47eb6d98115afa0999
+size 45657
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_MatrixBadgeAtomNeutralWrapping_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_MatrixBadgeAtomNeutralWrapping_Day_0_en.png
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3d625940faf9ae173d917dbe2a5b03e7ebb3fcc466f9c1e9ae59e1699eb78ef8
+size 11377
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_MatrixBadgeAtomNeutralWrapping_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_MatrixBadgeAtomNeutralWrapping_Night_0_en.png
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:835ad5142547d4845f7180b0748be8c04499602c12f4cc13468774b5b6bc7399
+size 11137
--- a/tools/localazy/config.json
+++ b/tools/localazy/config.json
@ -206,6 +206,7 @@
    {
      "name" : ":features:roomdetails:impl",
      "includeRegex" : [
+        "crypto\\.history_sharing\\.room_info_.*",
        "screen_room_details_.*",
        "screen\\.room_details\\..*",
        "screen_room_member_list_.*",