code review fixes

element-hq · Feb 9, 2022 · 2f4de46 · 2f4de46
1 parent def8a4f
commit 2f4de46
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/changelog.d/5183.sdk b/changelog.d/5183.sdk
@@ -0,0 +1 @@
+`join` and `leave` methods moved from MembershipService to RoomService and SpaceService to split logic for rooms and spaces
diff --git a/...k-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt b/...k-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt
@@ -344,7 +344,6 @@ class SpaceHierarchyTest : InstrumentedTest {
         // Test part one of the rooms
 
         val bRoomId = spaceBInfo.roomIds.first()
-        val bRoom = session.getRoom(bRoomId)
 
         commonTestHelper.waitWithLatch { latch ->
             val flatAChildren = session.getFlattenRoomSummaryChildrenOfLive(spaceAInfo.spaceId)
@@ -360,7 +359,7 @@ class SpaceHierarchyTest : InstrumentedTest {
             }
 
             // part from b room
-            bRoom!!.leave(null)
+            session.leaveRoom(bRoomId)
             // The room should have disapear from flat children
             flatAChildren.observeForever(childObserver)
         }

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt
@@ -89,10 +89,10 @@ interface SpaceService {
 
     /**
      * Leave the space, or reject an invitation.
-     * @param roomId the roomId of the space to leave
+     * @param spaceId the spaceId of the space to leave
      * @param reason optional reason for leaving the space
      */
-    suspend fun leaveSpace(roomId: String, reason: String? = null)
+    suspend fun leaveSpace(spaceId: String, reason: String? = null)
 
 //    fun getSpaceParentsOfRoom(roomId: String) : List<SpaceSummary>
 

diff --git a/...ndroid/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt b/...ndroid/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
@@ -184,8 +184,8 @@ internal class DefaultSpaceService @Inject constructor(
         return joinSpaceTask.execute(JoinSpaceTask.Params(spaceIdOrAlias, reason, viaServers))
     }
 
-    override suspend fun leaveSpace(roomId: String, reason: String?) {
-        leaveRoomTask.execute(LeaveRoomTask.Params(roomId, reason))
+    override suspend fun leaveSpace(spaceId: String, reason: String?) {
+        leaveRoomTask.execute(LeaveRoomTask.Params(spaceId, reason))
     }
 
     override suspend fun rejectInvite(spaceId: String, reason: String?) {

diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
@@ -222,10 +222,9 @@ class RoomListViewModel @AssistedInject constructor(
             )
         }
 
-        val room = session.getRoom(roomId) ?: return@withState
         viewModelScope.launch {
             try {
-                session.joinRoom(room.roomId)
+                session.joinRoom(roomId)
                 analyticsTracker.capture(action.roomSummary.toAnalyticsJoinedRoom())
                 // We do not update the joiningRoomsIds here, because, the room is not joined yet regarding the sync data.
                 // Instead, we wait for the room to be joined
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		`join` and `leave` methods moved from MembershipService to RoomService and SpaceService to split logic for rooms and spaces