Merge pull request #4219 from element-hq/feature/bma/encryptionBadge

Always display encryption badge
element-hq · Jan 30, 2025 · 22795af · 22795af
2 parents 73c66dd + e214345
commit 22795af
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/...ils/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsState.kt b/...ils/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsState.kt
@@ -48,12 +48,10 @@ data class RoomDetailsState(
     val eventSink: (RoomDetailsEvent) -> Unit
 ) {
     val roomBadges = buildList {
-        if (isEncrypted || isPublic) {
-            if (isEncrypted) {
-                add(RoomBadge.ENCRYPTED)
-            } else {
-                add(RoomBadge.NOT_ENCRYPTED)
-            }
+        if (isEncrypted) {
+            add(RoomBadge.ENCRYPTED)
+        } else {
+            add(RoomBadge.NOT_ENCRYPTED)
         }
         if (isPublic) {
             add(RoomBadge.PUBLIC)

diff --git a/...impl/src/test/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsStateTest.kt b/...impl/src/test/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsStateTest.kt
@@ -13,12 +13,14 @@ import org.junit.Test
 
 class RoomDetailsStateTest {
     @Test
-    fun `room not public not encrypted should have no badges`() {
+    fun `room not public not encrypted should have not encrypted badge`() {
         val sut = aRoomDetailsState(
             isPublic = false,
             isEncrypted = false,
         )
-        assertThat(sut.roomBadges).isEmpty()
+        assertThat(sut.roomBadges).isEqualTo(
+            persistentListOf(RoomBadge.NOT_ENCRYPTED)
+        )
     }
 
     @Test

diff --git a/...ts/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_6_en.png b/...ts/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_6_en.png
diff --git a/...itests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_6_en.png b/...itests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_6_en.png