From 2c3e4a45e42a83008564910bc709a8fde2cc0972 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Thu, 2 Oct 2025 19:49:34 +0200
Subject: [PATCH] Leave space: notify the room membership change

---
 .../android/libraries/matrix/impl/RustMatrixClient.kt    | 5 ++++-
 .../libraries/matrix/impl/spaces/RustLeaveSpaceHandle.kt | 9 +++++++++
 .../libraries/matrix/impl/spaces/RustSpaceService.kt     | 3 +++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt
index 3f84621cb7..a84a7bc164 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt
+++ b/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,
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/RustLeaveSpaceHandle.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/RustLeaveSpaceHandle.kt
index aa8cff7024..e7e629b40b 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/RustLeaveSpaceHandle.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/RustLeaveSpaceHandle.kt
@@ -9,6 +9,8 @@ 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
@@ -21,6 +23,7 @@ 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 {
@@ -45,6 +48,12 @@ class RustLeaveSpaceHandle(
         // 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)
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/RustSpaceService.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/RustSpaceService.kt
index 784cc586e2..88f738f0c4 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/RustSpaceService.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/RustSpaceService.kt
@@ -10,6 +10,7 @@ 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
@@ -38,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)
@@ -69,6 +71,7 @@ class RustSpaceService(
         return RustLeaveSpaceHandle(
             id = spaceId,
             spaceRoomMapper = spaceRoomMapper,
+            roomMembershipObserver = roomMembershipObserver,
             sessionCoroutineScope = sessionCoroutineScope,
         ) {
             innerSpaceService.leaveSpace(spaceId.value)