aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorChristian S <christian@pix-art.de>2015-07-23 21:19:36 +0200
committerChristian S <christian@pix-art.de>2015-07-23 21:19:36 +0200
commit32127fe96b8cd20310ea5fa9bb8d2c6a887c2956 (patch)
tree0eccb0200260842bb9c5381e2f5995243dd4a9f1 /src/main
parentbebf82d892d06b02072a088e8103d9dcfb164769 (diff)
changed subtitle a bit
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/eu/siacs/conversations/entities/Conversation.java3
-rw-r--r--src/main/java/eu/siacs/conversations/ui/ConversationActivity.java2
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());