join and leave methods moved from MembershipService to RoomService an… #5183
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…d SpaceService to split logic for rooms and spaces
Matrix SDKIntegration Tests Results:
|
ganfra
requested changes
Feb 8, 2022
| @@ -184,6 +184,10 @@ internal class DefaultSpaceService @Inject constructor( | |||
| return joinSpaceTask.execute(JoinSpaceTask.Params(spaceIdOrAlias, reason, viaServers)) | |||
| } | |||
|
|
|||
| override suspend fun leaveSpace(roomId: String, reason: String?) { | |||
There was a problem hiding this comment.
initially changed to spaceId, but since we use Room for Space sometimes wasn't sure if it won't be confusing. Like
leaveSpace(spaceId = room.roomId). What do you think?
| * @param roomId the roomId of the space to leave | ||
| * @param reason optional reason for leaving the space | ||
| */ | ||
| suspend fun leaveSpace(roomId: String, reason: String? = null) |
| @@ -225,7 +225,7 @@ class RoomListViewModel @AssistedInject constructor( | |||
| val room = session.getRoom(roomId) ?: return@withState | |||
bmarty
reviewed
Feb 14, 2022
| @@ -72,14 +72,14 @@ class SpaceLeaveAdvancedViewModel @AssistedInject constructor( | |||
| try { | |||
| state.selectedRooms.forEach { | |||
| try { | |||
| session.getRoom(it)?.leave(null) | |||
| session.leaveRoom(it) | |||
There was a problem hiding this comment.
Behind the scene I think this is equivalent to leave a room or a space, but can it be a spaceId sometimes here?
There was a problem hiding this comment.
As far i understand we leave all selected rooms in a space here. Maybe there could be also subspaces, but I think rooms is more often and more relevant here.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There are methods to join and leave room/space in
MembershipServicebut in context of this service (as part ofRoom) it's not always possible to validate if current instance isRoomorSpaceandJoinRoomTaskis always used, even though for spaces we should useJoinSpaceTask. This PR removesjoinandleavemethods fromMembershipServiceand replaces it with a separate implementation inRoomServiceandSpaceServiceaccording to context. This will allow us to properly track events for analytics and also will prevent possible bugs when Space is treated as Room