Load existing DM instead of creating a new one #4157
Conversation
Florian14
force-pushed
the
feature/fre/create_dm_improvement
branch
from
71d551c to
17bcf90
Compare
|
@Florian14 do you thing this can close #2893? |
@bmarty I think so, just tested before and after my PR, work fine now. |
| @@ -71,10 +71,13 @@ class CreateDirectRoomViewModel @AssistedInject constructor(@Assisted | |||
| * If users already have a DM room then navigate to it instead of creating a new room. | |||
| */ | |||
| private fun onSubmitInvitees(action: CreateDirectRoomAction.CreateRoomAndInviteSelectedUsers) { | |||
| if (action.existingDmRoomId != null) { | |||
| val existingRoomId = action.selections.singleOrNull()?.getMxId()?.let { userId -> | |||
There was a problem hiding this comment.
This does not look right. If it's a request for a grouped DM this will just open the DM with the first user?
** Edit ** ok single or null would do the trick.
check getMxid it's not always returning mxid.
An improvment could be to check for existing grouped DM
There was a problem hiding this comment.
Indeed, agree to check for existing grouped DM, requires some more changes
| fun getMxId(): String { | ||
| return when (this) { | ||
| is UserPendingSelection -> user.userId | ||
| is ThreePidPendingSelection -> threePid.value |
There was a problem hiding this comment.
this would be a mail or Pn but not a mxid
There was a problem hiding this comment.
Yes, but I think it will work, until the other user has not joined the room. @Florian14 do you confirm?
There was a problem hiding this comment.
I thought the user email was used as the mxId until the user has accepted the invite (is mxId != userId ?). This is probably a lack of knowledge of the protocol on my part.
In previous implementation, existing DM was checked only for QR code invites.
This PR moves this check in the ViewModel side (which makes more sense) and applies it for 1:1 in both cases (QR and user invites).