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

Revert: Use member name instead of room name in DM creation item (#6049)

Browse Source
This commit is contained in:
ClaireG 2022-05-19 16:14:58 +02:00 committed by GitHub
parent da764d7c9a
commit b379ef46ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/6032.bugfix Normal file
View File

@ -0,0 +1 @@
Revert: Use member name instead of room name in DM creation item

2
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedRoomCreationItem.kt
View File

@ -135,7 +135,7 @@ abstract class MergedRoomCreationItem : BasedMergedItem<MergedRoomCreationItem.H
if (isDirect) { if (isDirect) {
holder.roomDescriptionText.text = holder.view.resources.getString( holder.roomDescriptionText.text = holder.view.resources.getString(
R.string.this_is_the_beginning_of_dm, R.string.this_is_the_beginning_of_dm,
distinctMergeData.lastOrNull()?.memberName ?: "" roomSummary?.displayName ?: ""
) )
} else if (roomDisplayName.isNullOrBlank() || roomSummary.name.isBlank()) { } else if (roomDisplayName.isNullOrBlank() || roomSummary.name.isBlank()) {
holder.roomDescriptionText.text = holder.view.resources.getString(R.string.this_is_the_beginning_of_room_no_name) holder.roomDescriptionText.text = holder.view.resources.getString(R.string.this_is_the_beginning_of_room_no_name)