From c6728dde3886ef5f66172fdb51dfa281ce499575 Mon Sep 17 00:00:00 2001
From: ericdecanini <eddecanini@gmail.com>
Date: Wed, 6 Jul 2022 13:36:17 +0100
Subject: [PATCH] Changes string format of space parents to maintain parity
 with web

---
 .../features/home/room/list/RoomSummaryItemFactory.kt | 11 ++++++++++-
 vector/src/main/res/values/strings.xml                |  2 ++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
index 79c6fe3209..60ee1eda83 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
@@ -207,9 +207,18 @@ class RoomSummaryItemFactory @Inject constructor(
 
     private fun getSearchResultSubtitle(roomSummary: RoomSummary): String {
         val userId = roomSummary.directUserId
-        val directParent = roomSummary.directParentNames.takeIf { it.isNotEmpty() }?.joinToString()
+        val directParent = joinParentNames(roomSummary)
         val canonicalAlias = roomSummary.canonicalAlias
 
         return (userId ?: directParent ?: canonicalAlias).orEmpty()
     }
+
+    private fun joinParentNames(roomSummary: RoomSummary) = with(roomSummary) {
+        when (directParentNames.size) {
+            0 -> null
+            1 -> directParentNames.first()
+            2 -> stringProvider.getString(R.string.search_space_two_parents, directParentNames[0], directParentNames[1])
+            else -> stringProvider.getString(R.string.search_space_multiple_parents, directParentNames.first(), directParentNames.size - 1)
+        }
+    }
 }
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 933f3f0602..f0597405d8 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -762,6 +762,8 @@
     <string name="search_members_hint">Filter room members</string>
     <string name="search_banned_user_hint">Filter banned users</string>
     <string name="search_no_results">No results</string>
+    <string name="search_space_two_parents">%1$s and %2$s</string>
+    <string name="search_space_multiple_parents">%1$s and %2$d others</string>
 
     <!-- home room settings -->
     <string name="room_settings_all_messages">All messages</string>