Crash: open private room by link #5786
Merged
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
Florian14
approved these changes
Apr 19, 2022
Claire1817
requested review from
a team and
Florian14
and removed request for
a team and
Florian14
Florian14
requested review from
a team and
Florian14
and removed request for
a team and
Florian14
giomfo
reviewed
Apr 19, 2022
Co-authored-by: giomfo <giom@matrix.org>
ouchadam
reviewed
Apr 19, 2022
| @@ -296,8 +297,13 @@ class MatrixToBottomSheetViewModel @AssistedInject constructor( | |||
| } | |||
| viewModelScope.launch { | |||
| try { | |||
| session.joinRoom(action.roomId, null, action.viaServers?.take(3) ?: emptyList()) | |||
| _viewEvents.post(MatrixToViewEvents.NavigateToRoom(action.roomId)) | |||
| session.joinRoom(action.roomIdOrAlias, null, action.viaServers?.take(3) ?: emptyList()) | |||
There was a problem hiding this comment.
to help give extra context it would be handy if the null / true arguments used named parameters (or we could extract constants)
There was a problem hiding this comment.
I put the named parameters for all the arguments here :) it's more understandable.
ouchadam
reviewed
Apr 19, 2022
| session.joinRoom(action.roomId, null, action.viaServers?.take(3) ?: emptyList()) | ||
| _viewEvents.post(MatrixToViewEvents.NavigateToRoom(action.roomId)) | ||
| session.joinRoom(action.roomIdOrAlias, null, action.viaServers?.take(3) ?: emptyList()) | ||
| val roomId: String = if (MatrixPatterns.isRoomAlias(action.roomIdOrAlias)) { |
There was a problem hiding this comment.
do you think it's worth extracting out a method for converting roomIdOrAlias to just roomId?
ouchadam
reviewed
Apr 19, 2022
| @@ -24,7 +24,7 @@ sealed class MatrixToAction : VectorViewModelAction { | |||
| object FailedToResolveUser : MatrixToAction() | |||
| object FailedToStartChatting : MatrixToAction() | |||
| data class JoinSpace(val spaceID: String, val viaServers: List<String>?) : MatrixToAction() | |||
| data class JoinRoom(val roomId: String, val viaServers: List<String>?) : MatrixToAction() | |||
| data class JoinRoom(val roomIdOrAlias: String, val viaServers: List<String>?) : MatrixToAction() | |||
There was a problem hiding this comment.
thinking out loud for the future, I could imagine separate types for roomId, spaceId and roomAlias
There was a problem hiding this comment.
yes, it could be separate. But i think this will generate a refacto.
ouchadam
approved these changes
Apr 19, 2022
This reverts commit 9a83da4.
ouchadam
reviewed
Apr 19, 2022
| @@ -309,6 +314,12 @@ class MatrixToBottomSheetViewModel @AssistedInject constructor( | |||
| } | |||
| } | |||
|
|
|||
| private suspend fun getRoomIdFromRoomIdOrAlias(roomIdOrAlias: String): String { | |||
This was referenced Apr 20, 2022
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.
Type of change
Content
Use roomId instead of alias for NavigateToRoom
In some cases, the alias was used instead of the room id. The alias was blocking the room creation in the DB.
Motivation and context
tchapgouv/tchap-android#554
Screenshots / GIFs
Tests
Tested devices
Checklist