narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

properly show contact name in muc

Browse source
This commit is contained in:
kosyak 2024-06-02 20:31:20 +02:00
parent 3f43dc6d5f
commit e745dae1dc
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/eu/siacs/conversations/utils/UIHelper.java
View file

@ -519,10 +519,14 @@ public class UIHelper {
if (message.getStatus() == Message.STATUS_RECEIVED) { if (message.getStatus() == Message.STATUS_RECEIVED) {
final Contact contact = message.getContact(); final Contact contact = message.getContact();
if (conversation.getMode() == Conversation.MODE_MULTI) { if (conversation.getMode() == Conversation.MODE_MULTI) {
if (contact != null) { String mucCounterpart = getDisplayedMucCounterpart(message.getCounterpart());
if (!mucCounterpart.isEmpty()) {
return mucCounterpart;
} else if (contact != null) {
return contact.getDisplayName(); return contact.getDisplayName();
} else { } else {
return getDisplayedMucCounterpart(message.getCounterpart()); return mucCounterpart;
} }
} else { } else {
return contact != null ? contact.getDisplayName() : ""; return contact != null ? contact.getDisplayName() : "";