Merge pull request #5979 from element-hq/feature/fga/space_members_access

Change Room’s Access to/from Space members

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/SpaceService.kt

@@ -15,6 +15,10 @@ interface SpaceService {
     val spaceRoomsFlow: SharedFlow<List<SpaceRoom>>
     suspend fun joinedSpaces(): Result<List<SpaceRoom>>
 
+    suspend fun joinedParents(spaceId: RoomId): Result<List<SpaceRoom>>
+
+    suspend fun getSpaceRoom(spaceId: RoomId): SpaceRoom?
+
     fun spaceRoomList(id: RoomId): SpaceRoomList
 
     fun getLeaveSpaceHandle(spaceId: RoomId): LeaveSpaceHandle

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/RustSpaceService.kt

@@ -51,13 +51,28 @@ class RustSpaceService(
 
     override suspend fun joinedSpaces(): Result<List<SpaceRoom>> = withContext(sessionDispatcher) {
         runCatchingExceptions {
-            innerSpaceService.topLevelJoinedSpaces()
-                .map {
-                    it.let(spaceRoomMapper::map)
-                }
+            innerSpaceService
+                .topLevelJoinedSpaces()
+                .map(spaceRoomMapper::map)
         }
     }
 
+    override suspend fun joinedParents(spaceId: RoomId): Result<List<SpaceRoom>> = withContext(sessionDispatcher) {
+        runCatchingExceptions {
+            innerSpaceService
+                .joinedParentsOfChild(spaceId.value)
+                .map(spaceRoomMapper::map)
+        }
+    }
+
+    override suspend fun getSpaceRoom(spaceId: RoomId): SpaceRoom? = withContext(sessionDispatcher) {
+        runCatchingExceptions {
+            innerSpaceService.getSpaceRoom(spaceId.value)?.let { spaceRoom ->
+                spaceRoomMapper.map(spaceRoom)
+            }
+        }.getOrNull()
+    }
+
     override fun spaceRoomList(id: RoomId): SpaceRoomList {
         val childCoroutineScope = sessionCoroutineScope.childScope(sessionDispatcher, "SpaceRoomListScope-$this")
         return RustSpaceRoomList(

libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/spaces/FakeSpaceService.kt

@@ -23,6 +23,8 @@ class FakeSpaceService(
     private val joinedSpacesResult: () -> Result<List<SpaceRoom>> = { lambdaError() },
     private val spaceRoomListResult: (RoomId) -> SpaceRoomList = { lambdaError() },
     private val leaveSpaceHandleResult: (RoomId) -> LeaveSpaceHandle = { lambdaError() },
+    private val joinedParentsResult: (RoomId) -> Result<List<SpaceRoom>> = { lambdaError() },
+    private val getSpaceRoomResult: (RoomId) -> SpaceRoom? = { lambdaError() },
 ) : SpaceService {
     private val _spaceRoomsFlow = MutableSharedFlow<List<SpaceRoom>>()
     override val spaceRoomsFlow: SharedFlow<List<SpaceRoom>>
@@ -36,6 +38,14 @@ class FakeSpaceService(
         return joinedSpacesResult()
     }
 
+    override suspend fun joinedParents(spaceId: RoomId): Result<List<SpaceRoom>> {
+        return joinedParentsResult(spaceId)
+    }
+
+    override suspend fun getSpaceRoom(spaceId: RoomId): SpaceRoom? {
+        return getSpaceRoomResult(spaceId)
+    }
+
     override fun spaceRoomList(id: RoomId): SpaceRoomList {
         return spaceRoomListResult(id)
     }

libraries/ui-strings/src/main/res/values-et/translations.xml

@@ -435,11 +435,6 @@ Kas sa oled kindel, et soovid jätkata?"</string>
   <string name="screen_create_poll_options_section_title">"Valikud"</string>
   <string name="screen_create_poll_remove_accessibility_label">"Kustuta: %1$s"</string>
   <string name="screen_create_poll_settings_section_title">"Seadistused"</string>
-  <string name="screen_manage_authorized_spaces_header">"Kogukonnad, milles on võimalik jututoaga liituda ilma kutseta."</string>
-  <string name="screen_manage_authorized_spaces_title">"Halda kogukondi"</string>
-  <string name="screen_manage_authorized_spaces_unknown_space">"(Tundmatu kogukond)"</string>
-  <string name="screen_manage_authorized_spaces_unknown_spaces_section_title">"Muud kogukonnad, mille liige sa ei ole"</string>
-  <string name="screen_manage_authorized_spaces_your_spaces_section_title">"Sinu kogukonnad"</string>
   <string name="screen_media_picker_error_failed_selection">"Meediafaili valimine ei õnnestunud. Palun proovi uuesti."</string>
   <string name="screen_pinned_timeline_empty_state_description">"Siia lisamiseks vajuta sõnumil ja vali „%1$s“."</string>
   <string name="screen_pinned_timeline_empty_state_headline">"Et olulisi sõnumeid oleks lihtsam leida, tõsta nad esile"</string>

libraries/ui-strings/src/main/res/values-fr/translations.xml

@@ -435,11 +435,6 @@ Raison : %1$s."</string>
   <string name="screen_create_poll_options_section_title">"Options"</string>
   <string name="screen_create_poll_remove_accessibility_label">"Supprimer %1$s"</string>
   <string name="screen_create_poll_settings_section_title">"Paramètres"</string>
-  <string name="screen_manage_authorized_spaces_header">"Espaces où les membres peuvent rejoindre le salon sans invitation."</string>
-  <string name="screen_manage_authorized_spaces_title">"Gérer les espaces"</string>
-  <string name="screen_manage_authorized_spaces_unknown_space">"(Espace inconnu)"</string>
-  <string name="screen_manage_authorized_spaces_unknown_spaces_section_title">"Autres espaces dont vous n’êtes pas membre"</string>
-  <string name="screen_manage_authorized_spaces_your_spaces_section_title">"Vos espaces"</string>
   <string name="screen_media_picker_error_failed_selection">"Échec de la sélection du média, veuillez réessayer."</string>
   <string name="screen_pinned_timeline_empty_state_description">"Cliquez (clic long) sur un message et choisissez « %1$s » pour qu‘il apparaisse ici."</string>
   <string name="screen_pinned_timeline_empty_state_headline">"Épinglez les messages importants pour leur donner plus de visibilité"</string>

libraries/ui-strings/src/main/res/values-hr/translations.xml

@@ -443,11 +443,6 @@ Jeste li sigurni da želite nastaviti?"</string>
   <string name="screen_create_poll_options_section_title">"Mogućnosti"</string>
   <string name="screen_create_poll_remove_accessibility_label">"Ukloni %1$s"</string>
   <string name="screen_create_poll_settings_section_title">"Postavke"</string>
-  <string name="screen_manage_authorized_spaces_header">"Prostori u kojima se članovi mogu pridružiti sobi bez pozivnice."</string>
-  <string name="screen_manage_authorized_spaces_title">"Upravljaj prostorima"</string>
-  <string name="screen_manage_authorized_spaces_unknown_space">"(nepoznati prostor)"</string>
-  <string name="screen_manage_authorized_spaces_unknown_spaces_section_title">"Drugi prostori čiji niste član"</string>
-  <string name="screen_manage_authorized_spaces_your_spaces_section_title">"Vaši prostori"</string>
   <string name="screen_media_picker_error_failed_selection">"Odabir medija nije uspio, pokušajte ponovno."</string>
   <string name="screen_pinned_timeline_empty_state_description">"Pritisnite poruku i odaberite “%1$s” kako biste uključili ovdje."</string>
   <string name="screen_pinned_timeline_empty_state_headline">"Prikvačite važne poruke kako bi ih se lakše moglo pronaći"</string>

libraries/ui-strings/src/main/res/values-pt-rBR/translations.xml

@@ -434,11 +434,6 @@ Você tem certeza de que deseja continuar?"</string>
   <string name="screen_create_poll_options_section_title">"Opções"</string>
   <string name="screen_create_poll_remove_accessibility_label">"Remover %1$s"</string>
   <string name="screen_create_poll_settings_section_title">"Configurações"</string>
-  <string name="screen_manage_authorized_spaces_header">"Os espaços dos quais os membros podem entrar na sala sem um convite."</string>
-  <string name="screen_manage_authorized_spaces_title">"Gerenciar espaços"</string>
-  <string name="screen_manage_authorized_spaces_unknown_space">"(Espaço desconhecido)"</string>
-  <string name="screen_manage_authorized_spaces_unknown_spaces_section_title">"Outros espaços dos quais você não é um membro"</string>
-  <string name="screen_manage_authorized_spaces_your_spaces_section_title">"Seus espaços"</string>
   <string name="screen_media_picker_error_failed_selection">"Falha ao selecionar a mídia, tente novamente."</string>
   <string name="screen_pinned_timeline_empty_state_description">"Pressione em uma mensagem e escolha \"%1$s\" para incluir aqui."</string>
   <string name="screen_pinned_timeline_empty_state_headline">"Fixe mensagens importantes para que elas possam ser facilmente descobertas"</string>

libraries/ui-strings/src/main/res/values-ro/translations.xml

@@ -442,11 +442,6 @@ Sunteți sigur că doriți să continuați?"</string>
   <string name="screen_create_poll_options_section_title">"Opțiuni"</string>
   <string name="screen_create_poll_remove_accessibility_label">"Ștergeți %1$s"</string>
   <string name="screen_create_poll_settings_section_title">"Setări"</string>
-  <string name="screen_manage_authorized_spaces_header">"Spațile din care membrii se pot alătura camerei fără invitație."</string>
-  <string name="screen_manage_authorized_spaces_title">"Gestionați spațiile"</string>
-  <string name="screen_manage_authorized_spaces_unknown_space">"(Spațiu necunoscut)"</string>
-  <string name="screen_manage_authorized_spaces_unknown_spaces_section_title">"Alte spații din care nu faceți parte"</string>
-  <string name="screen_manage_authorized_spaces_your_spaces_section_title">"Spațiile dumneavoastră"</string>
   <string name="screen_media_picker_error_failed_selection">"Selectarea fișierelor media a eșuat, încercați din nou."</string>
   <string name="screen_pinned_timeline_empty_state_description">"Apăsați pe un mesaj și alegeți \"%1$s\" pentru a-l include aici."</string>
   <string name="screen_pinned_timeline_empty_state_headline">"Fixați mesajele importante, astfel încât să poată fi descoperite cu ușurință"</string>

libraries/ui-strings/src/main/res/values-sk/translations.xml

@@ -439,11 +439,6 @@ Naozaj chcete pokračovať?"</string>
   <string name="screen_create_poll_options_section_title">"Možnosti"</string>
   <string name="screen_create_poll_remove_accessibility_label">"Odstrániť %1$s"</string>
   <string name="screen_create_poll_settings_section_title">"Nastavenia"</string>
-  <string name="screen_manage_authorized_spaces_header">"Priestory, kde sa členovia môžu pripojiť k miestnosti bez pozvania."</string>
-  <string name="screen_manage_authorized_spaces_title">"Spravovať priestory"</string>
-  <string name="screen_manage_authorized_spaces_unknown_space">"(Neznámy priestor)"</string>
-  <string name="screen_manage_authorized_spaces_unknown_spaces_section_title">"Iné priestory, ktorých nie ste členom"</string>
-  <string name="screen_manage_authorized_spaces_your_spaces_section_title">"Vaše priestory"</string>
   <string name="screen_media_picker_error_failed_selection">"Nepodarilo sa vybrať médium, skúste to prosím znova."</string>
   <string name="screen_pinned_timeline_empty_state_description">"Stlačte správu a vyberte možnosť „%1$s“, ktorú chcete zahrnúť sem."</string>
   <string name="screen_pinned_timeline_empty_state_headline">"Pripnite dôležité správy, aby sa dali ľahko nájsť"</string>

libraries/ui-strings/src/main/res/values/localazy.xml

@@ -435,11 +435,6 @@ Are you sure you want to continue?"</string>
   <string name="screen_create_poll_options_section_title">"Options"</string>
   <string name="screen_create_poll_remove_accessibility_label">"Remove %1$s"</string>
   <string name="screen_create_poll_settings_section_title">"Settings"</string>
-  <string name="screen_manage_authorized_spaces_header">"Spaces where members can join the room without an invitation."</string>
-  <string name="screen_manage_authorized_spaces_title">"Manage spaces"</string>
-  <string name="screen_manage_authorized_spaces_unknown_space">"(Unknown space)"</string>
-  <string name="screen_manage_authorized_spaces_unknown_spaces_section_title">"Other spaces you’re not a member of"</string>
-  <string name="screen_manage_authorized_spaces_your_spaces_section_title">"Your spaces"</string>
   <string name="screen_media_picker_error_failed_selection">"Failed selecting media, please try again."</string>
   <string name="screen_pinned_timeline_empty_state_description">"Press on a message and choose “%1$s” to include here."</string>
   <string name="screen_pinned_timeline_empty_state_headline">"Pin important messages so that they can be easily discovered"</string>