rei-forks/element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix #1373

Browse Source
This commit is contained in:
Benoit Marty 2020-05-15 15:36:52 +02:00
parent ea1c75c16a
commit 8eebcef4e9
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/user/model/User.kt
View File

@ -22,6 +22,9 @@ package im.vector.matrix.android.api.session.user.model
*/ */
data class User( data class User(
val userId: String, val userId: String,
/**
* For usage in UI, consider using [getBestName]
*/
val displayName: String? = null, val displayName: String? = null,
val avatarUrl: String? = null val avatarUrl: String? = null
) { ) {

8
vector/src/main/java/im/vector/riotx/features/invite/InviteUsersToRoomViewModel.kt
View File

@ -66,13 +66,13 @@ class InviteUsersToRoomViewModel @AssistedInject constructor(@Assisted
{ {
val successMessage = when (selectedUsers.size) { val successMessage = when (selectedUsers.size) {
1 -> stringProvider.getString(R.string.invitation_sent_to_one_user, 1 -> stringProvider.getString(R.string.invitation_sent_to_one_user,
selectedUsers.first().displayName) selectedUsers.first().getBestName())
2 -> stringProvider.getString(R.string.invitations_sent_to_two_users, 2 -> stringProvider.getString(R.string.invitations_sent_to_two_users,
selectedUsers.first().displayName, selectedUsers.first().getBestName(),
selectedUsers.last().displayName) selectedUsers.last().getBestName())
else -> stringProvider.getQuantityString(R.plurals.invitations_sent_to_one_and_more_users, else -> stringProvider.getQuantityString(R.plurals.invitations_sent_to_one_and_more_users,
selectedUsers.size - 1, selectedUsers.size - 1,
selectedUsers.first().displayName, selectedUsers.first().getBestName(),
selectedUsers.size - 1) selectedUsers.size - 1)
} }
_viewEvents.post(InviteUsersToRoomViewEvents.Success(successMessage)) _viewEvents.post(InviteUsersToRoomViewEvents.Success(successMessage))