diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-09-22 13:23:35 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-09-22 13:23:35 +0200 |
| commit | 45aede14bd7d384e8adbcd6697ba39b1dcbf77b4 (patch) | |
| tree | 760d017b369aa8648c00234ad979f42f1ee6e9cb /src/eu/siacs/conversations/ui/ConversationActivity.java | |
| parent | bb065020ff6145adf8fb2726928f11e0ea7140b6 (diff) | |
fixed #452
Diffstat (limited to 'src/eu/siacs/conversations/ui/ConversationActivity.java')
| -rw-r--r-- | src/eu/siacs/conversations/ui/ConversationActivity.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/eu/siacs/conversations/ui/ConversationActivity.java b/src/eu/siacs/conversations/ui/ConversationActivity.java index 03d034d91..07c262595 100644 --- a/src/eu/siacs/conversations/ui/ConversationActivity.java +++ b/src/eu/siacs/conversations/ui/ConversationActivity.java @@ -154,7 +154,11 @@ public class ConversationActivity extends XmppActivity implements if (ab != null) { ab.setDisplayHomeAsUpEnabled(true); ab.setHomeButtonEnabled(true); - ab.setTitle(getSelectedConversation().getName()); + if (getSelectedConversation().getMode() == Conversation.MODE_SINGLE || activity.useSubjectToIdentifyConference()) { + ab.setTitle(getSelectedConversation().getName()); + } else { + ab.setTitle(getSelectedConversation().getContactJid().split("/")[0]); + } } invalidateOptionsMenu(); if (!getSelectedConversation().isRead()) { |