From 4ba465fd04f135cf7c500d14229a825415cf0c5a Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 15 Jan 2026 17:07:25 +0100
Subject: [PATCH] Ensure that room with long names renders correctly in the
 room list.

---
 .../android/features/home/impl/components/RoomSummaryRow.kt  | 5 +++--
 .../android/libraries/core/extensions/BasicExtensions.kt     | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomSummaryRow.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomSummaryRow.kt
index 50b9559e94..d8426b5321 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomSummaryRow.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomSummaryRow.kt
@@ -46,6 +46,7 @@ import io.element.android.features.home.impl.model.RoomListRoomSummaryProvider
 import io.element.android.features.home.impl.model.RoomSummaryDisplayType
 import io.element.android.features.home.impl.roomlist.RoomListEvents
 import io.element.android.libraries.core.extensions.orEmpty
+import io.element.android.libraries.core.extensions.toSafeLength
 import io.element.android.libraries.designsystem.atomic.atoms.UnreadIndicatorAtom
 import io.element.android.libraries.designsystem.atomic.molecules.InviteButtonsRowMolecule
 import io.element.android.libraries.designsystem.components.avatar.Avatar
@@ -227,7 +228,7 @@ private fun NameAndTimestampRow(
             // Name
             Text(
                 style = ElementTheme.typography.fontBodyLgMedium,
-                text = name ?: stringResource(id = CommonStrings.common_no_room_name),
+                text = name?.toSafeLength(ellipsize = true) ?: stringResource(id = CommonStrings.common_no_room_name),
                 fontStyle = FontStyle.Italic.takeIf { name == null },
                 color = ElementTheme.colors.roomListRoomName,
                 maxLines = 1,
@@ -380,7 +381,7 @@ private fun InviteNameAndIndicatorRow(
         Text(
             modifier = Modifier.weight(1f),
             style = ElementTheme.typography.fontBodyLgMedium,
-            text = name ?: stringResource(id = CommonStrings.common_no_room_name),
+            text = name?.toSafeLength(ellipsize = true) ?: stringResource(id = CommonStrings.common_no_room_name),
             fontStyle = FontStyle.Italic.takeIf { name == null },
             color = ElementTheme.colors.roomListRoomName,
             maxLines = 1,
diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/BasicExtensions.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/BasicExtensions.kt
index d3a2805df1..d13777842d 100644
--- a/libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/BasicExtensions.kt
+++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/BasicExtensions.kt
@@ -100,6 +100,8 @@ fun String.containsRtLOverride() = contains(RTL_OVERRIDE_CHAR)
 
 fun String.filterDirectionOverrides() = filterNot { it == RTL_OVERRIDE_CHAR || it == LTR_OVERRIDE_CHAR }
 
+const val DEFAULT_SAFE_LENGTH = 500
+
 /**
  * This works around https://github.com/element-hq/element-x-android/issues/2105.
  * @param maxLength Max characters to retrieve. Defaults to `500`.
@@ -107,7 +109,7 @@ fun String.filterDirectionOverrides() = filterNot { it == RTL_OVERRIDE_CHAR || i
  * @return The string truncated to [maxLength] characters, with an optional ellipsis if larger.
  */
 fun String.toSafeLength(
-    maxLength: Int = 500,
+    maxLength: Int = DEFAULT_SAFE_LENGTH,
     ellipsize: Boolean = false,
 ): String {
     return if (ellipsize) {