Merge pull request #5432 from element-hq/feature/bma/leaveSpace

Leave space: use SDK API.

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

@@ -147,6 +147,8 @@ class RustMatrixClient(
     private val innerRoomListService = innerSyncService.roomListService()
     private val innerSpaceService = innerClient.spaceService()
 
+    private val roomMembershipObserver = RoomMembershipObserver()
+
     private val rustSyncService = RustSyncService(
         inner = innerSyncService,
         dispatcher = sessionDispatcher,
@@ -189,6 +191,7 @@ class RustMatrixClient(
 
     override val spaceService: SpaceService = RustSpaceService(
         innerSpaceService = innerSpaceService,
+        roomMembershipObserver = roomMembershipObserver,
         sessionCoroutineScope = sessionCoroutineScope,
         sessionDispatcher = sessionDispatcher,
     )
@@ -200,7 +203,7 @@ class RustMatrixClient(
     )
 
     private val roomInfoMapper = RoomInfoMapper()
-    private val roomMembershipObserver = RoomMembershipObserver()
+
     private val roomFactory = RustRoomFactory(
         roomListService = roomListService,
         innerRoomListService = innerRoomListService,

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/RecoveryExceptionMapper.kt

@@ -20,6 +20,9 @@ fun Throwable.mapRecoveryException(): RecoveryException {
                     message = errorMessage
                 )
                 is RustRecoveryException.BackupExistsOnServer -> RecoveryException.BackupExistsOnServer
+                is RustRecoveryException.Import -> RecoveryException.Import(
+                    message = errorMessage
+                )
                 is RustRecoveryException.Client -> RecoveryException.Client(
                     source.mapClientException()
                 )

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

@@ -0,0 +1,68 @@
+/*
+ * 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.impl.spaces
+
+import io.element.android.libraries.core.extensions.runCatchingExceptions
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.room.CurrentUserMembership
+import io.element.android.libraries.matrix.api.room.RoomMembershipObserver
+import io.element.android.libraries.matrix.api.spaces.LeaveSpaceHandle
+import io.element.android.libraries.matrix.api.spaces.LeaveSpaceRoom
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.launch
+import timber.log.Timber
+import org.matrix.rustcomponents.sdk.LeaveSpaceHandle as RustLeaveSpaceHandle
+
+class RustLeaveSpaceHandle(
+    override val id: RoomId,
+    private val spaceRoomMapper: SpaceRoomMapper,
+    private val roomMembershipObserver: RoomMembershipObserver,
+    sessionCoroutineScope: CoroutineScope,
+    private val innerProvider: suspend () -> RustLeaveSpaceHandle,
+) : LeaveSpaceHandle {
+    private val inner = CompletableDeferred<RustLeaveSpaceHandle>()
+
+    init {
+        sessionCoroutineScope.launch {
+            inner.complete(innerProvider())
+        }
+    }
+
+    override suspend fun rooms(): Result<List<LeaveSpaceRoom>> = runCatchingExceptions {
+        inner.await().rooms().map { leaveSpaceRoom ->
+            LeaveSpaceRoom(
+                spaceRoom = spaceRoomMapper.map(leaveSpaceRoom.spaceRoom),
+                isLastAdmin = leaveSpaceRoom.isLastAdmin,
+            )
+        }
+    }
+
+    override suspend fun leave(roomIds: List<RoomId>): Result<Unit> = runCatchingExceptions {
+        // Ensure the space is included and is the last room to be left
+        val roomToLeave = roomIds - id + id
+        inner.await().leave(roomToLeave.map { it.value })
+    }.onSuccess {
+        roomMembershipObserver.notifyUserLeftRoom(
+            roomId = id,
+            isSpace = true,
+            membershipBeforeLeft = CurrentUserMembership.JOINED,
+        )
+    }
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    override fun close() {
+        Timber.d("Destroying LeaveSpaceHandle $id")
+        try {
+            inner.getCompleted().destroy()
+        } catch (_: Exception) {
+            // Ignore, we just want to make sure it's completed
+        }
+    }
+}

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

@@ -10,6 +10,8 @@ package io.element.android.libraries.matrix.impl.spaces
 import io.element.android.libraries.core.coroutine.childScope
 import io.element.android.libraries.core.extensions.runCatchingExceptions
 import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.room.RoomMembershipObserver
+import io.element.android.libraries.matrix.api.spaces.LeaveSpaceHandle
 import io.element.android.libraries.matrix.api.spaces.SpaceRoom
 import io.element.android.libraries.matrix.api.spaces.SpaceRoomList
 import io.element.android.libraries.matrix.api.spaces.SpaceService
@@ -37,6 +39,7 @@ class RustSpaceService(
     private val innerSpaceService: ClientSpaceService,
     private val sessionCoroutineScope: CoroutineScope,
     private val sessionDispatcher: CoroutineDispatcher,
+    private val roomMembershipObserver: RoomMembershipObserver,
 ) : SpaceService {
     private val spaceRoomMapper = SpaceRoomMapper()
     override val spaceRoomsFlow = MutableSharedFlow<List<SpaceRoom>>(replay = 1, extraBufferCapacity = 1)
@@ -64,6 +67,17 @@ class RustSpaceService(
         )
     }
 
+    override fun getLeaveSpaceHandle(spaceId: RoomId): LeaveSpaceHandle {
+        return RustLeaveSpaceHandle(
+            id = spaceId,
+            spaceRoomMapper = spaceRoomMapper,
+            roomMembershipObserver = roomMembershipObserver,
+            sessionCoroutineScope = sessionCoroutineScope,
+        ) {
+            innerSpaceService.leaveSpace(spaceId.value)
+        }
+    }
+
     init {
         innerSpaceService
             .spaceListUpdate()