sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

show room nick for /me command in sent muc messages. fixes #1773

This commit is contained in:
Daniel Gultsch 2016-03-20 17:33:42 +01:00
parent ac09011690
commit 135c8567a5
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/eu/siacs/conversations/utils/UIHelper.java
View File

@ -225,9 +225,10 @@ public class UIHelper {
}
public static String getMessageDisplayName(final Message message) {
final Conversation conversation = message.getConversation();
if (message.getStatus() == Message.STATUS_RECEIVED) {
final Contact contact = message.getContact();
if (message.getConversation().getMode() == Conversation.MODE_MULTI) {
if (conversation.getMode() == Conversation.MODE_MULTI) {
if (contact != null) {
return contact.getDisplayName();
} else {
@ -237,10 +238,10 @@ public class UIHelper {
return contact != null ? contact.getDisplayName() : "";
}
} else {
if (message.getConversation().getMode() == Conversation.MODE_MULTI) {
return getDisplayedMucCounterpart(message.getConversation().getJid());
if (conversation.getMode() == Conversation.MODE_MULTI) {
return conversation.getMucOptions().getSelf().getName();
} else {
final Jid jid = message.getConversation().getAccount().getJid();
final Jid jid = conversation.getAccount().getJid();
return jid.hasLocalpart() ? jid.getLocalpart() : jid.toDomainJid().toString();
}
}