From 3c68dd8f75f1028ef8532b822913225c5444599b Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 19 Aug 2025 10:02:53 +0200
Subject: [PATCH] Improve accessibility.

---
 .../android/libraries/matrix/ui/components/SelectedRoom.kt   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedRoom.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedRoom.kt
index b013d862ec..bf6db009a7 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedRoom.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedRoom.kt
@@ -61,11 +61,14 @@ fun SelectedRoom(
     modifier: Modifier = Modifier,
 ) {
     val actionRemove = stringResource(id = CommonStrings.action_remove)
+    val a11yRoomName = stringResource(id = CommonStrings.common_room_name)
     Box(
         modifier = modifier
             .width(AvatarSize.SelectedRoom.dp)
             .clearAndSetSemantics {
-                contentDescription = roomInfo.name ?: "#"
+                contentDescription = roomInfo.name
+                    ?: roomInfo.canonicalAlias?.value
+                    ?: a11yRoomName
                 // Note: this does not set the click effect to the whole Box
                 // when talkback is not enabled
                 onClick(