diff options
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/entities/Conversation.java | 3 | ||||
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ConversationActivity.java | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java index b0e128ee8..2e858eb99 100644 --- a/src/main/java/eu/siacs/conversations/entities/Conversation.java +++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java @@ -20,6 +20,7 @@ import java.util.Iterator; import java.util.List; import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; import eu.siacs.conversations.xmpp.chatstate.ChatState; import eu.siacs.conversations.xmpp.jid.InvalidJidException; import eu.siacs.conversations.xmpp.jid.Jid; @@ -350,7 +351,7 @@ public class Conversation extends AbstractEntity implements Blockable { if (generatedName != null) { return generatedName; } else { - return getJid().getLocalpart(); + return null; //getJid().getLocalpart(); } } else { return null; diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java index 3f8841f33..4ace44e68 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java @@ -337,7 +337,7 @@ public class ConversationActivity extends XmppActivity ab.setSubtitle(null); } } else if (useSubjectToIdentifyConference()){ - ab.setSubtitle(conversation.getParticipants() + ", " + getText(R.string.you)); + ab.setSubtitle(conversation.getParticipants()); } } else { ab.setTitle(conversation.getJid().toBareJid().toString()); |