Merge branch 'develop' into feature/fga/space_ui_tweaks

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/qrlogin/QrLoginException.kt

@@ -13,6 +13,7 @@ sealed class QrLoginException : Exception() {
     data object ConnectionInsecure : QrLoginException()
     data object Declined : QrLoginException()
     data object Expired : QrLoginException()
+    data object NotFound : QrLoginException()
     data object LinkingNotSupported : QrLoginException()
     data object OidcMetadataInvalid : QrLoginException()
     data object SlidingSyncNotAvailable : QrLoginException()
@@ -20,5 +21,4 @@ sealed class QrLoginException : Exception() {
     data object CheckCodeAlreadySent : QrLoginException()
     data object CheckCodeCannotBeSent : QrLoginException()
     data object Unknown : QrLoginException()
-    data object NotFound : QrLoginException()
 }

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/history/RoomHistoryVisibility.kt

@@ -8,6 +8,9 @@
 
 package io.element.android.libraries.matrix.api.room.history
 
+import androidx.compose.runtime.Immutable
+
+@Immutable
 sealed interface RoomHistoryVisibility {
     /**
      * Previous events are accessible to newly joined members from the point

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/LatestEventValue.kt

@@ -28,4 +28,10 @@ sealed interface LatestEventValue {
         val senderProfile: ProfileDetails,
         val isSending: Boolean,
     ) : LatestEventValue
+
+    data class RoomInvite(
+        val timestamp: Long,
+        val inviterId: UserId?,
+        val invitedProfile: ProfileDetails,
+    ) : LatestEventValue
 }

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/RoomListFilter.kt

@@ -8,6 +8,8 @@
 
 package io.element.android.libraries.matrix.api.roomlist
 
+import io.element.android.libraries.matrix.api.core.RoomId
+
 sealed interface RoomListFilter {
     companion object {
         /**
@@ -41,6 +43,10 @@ sealed interface RoomListFilter {
         val filters: List<RoomListFilter>
     ) : RoomListFilter
 
+    data class Identifiers(
+        val values: List<RoomId>,
+    ) : RoomListFilter
+
     /**
      * A filter that matches rooms that are unread.
      */

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/RoomSummary.kt

@@ -19,6 +19,7 @@ data class RoomSummary(
         is LatestEventValue.None -> null
         is LatestEventValue.Local -> latestEvent.timestamp
         is LatestEventValue.Remote -> latestEvent.timestamp
+        is LatestEventValue.RoomInvite -> latestEvent.timestamp
     }
     val isOneToOne get() = info.activeMembersCount == 2L
 }

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

@@ -12,9 +12,8 @@ import io.element.android.libraries.matrix.api.core.RoomId
 import kotlinx.coroutines.flow.SharedFlow
 
 interface SpaceService {
-    val spaceRoomsFlow: SharedFlow<List<SpaceRoom>>
-    suspend fun joinedSpaces(): Result<List<SpaceRoom>>
-
+    val topLevelSpacesFlow: SharedFlow<List<SpaceRoom>>
+    val spaceFiltersFlow: SharedFlow<List<SpaceServiceFilter>>
     suspend fun joinedParents(spaceId: RoomId): Result<List<SpaceRoom>>
 
     suspend fun getSpaceRoom(spaceId: RoomId): SpaceRoom?

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

@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.api.spaces
+
+import io.element.android.libraries.matrix.api.core.RoomId
+
+/**
+ * Represents a space filter for filtering rooms by space membership.
+ *
+ * @property spaceRoom The space room associated with this filter.
+ * @property level The nesting level of the space (0 = top level, 1 = first level child, etc.).
+ * @property descendants The list of room IDs that are descendants of this space.
+ */
+data class SpaceServiceFilter(
+    val spaceRoom: SpaceRoom,
+    val level: Int,
+    val descendants: List<RoomId>,
+)