aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/ui/ConversationFragment.java
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-09-22 13:23:35 +0200
committeriNPUTmice <daniel@gultsch.de>2014-09-22 13:23:35 +0200
commit45aede14bd7d384e8adbcd6697ba39b1dcbf77b4 (patch)
tree760d017b369aa8648c00234ad979f42f1ee6e9cb /src/eu/siacs/conversations/ui/ConversationFragment.java
parentbb065020ff6145adf8fb2726928f11e0ea7140b6 (diff)
fixed #452
Diffstat (limited to '')
-rw-r--r--src/eu/siacs/conversations/ui/ConversationFragment.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/eu/siacs/conversations/ui/ConversationFragment.java b/src/eu/siacs/conversations/ui/ConversationFragment.java
index 299bf281..feed9df5 100644
--- a/src/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/eu/siacs/conversations/ui/ConversationFragment.java
@@ -380,7 +380,11 @@ public class ConversationFragment extends Fragment {
activity.getSlidingPaneLayout().closePane();
activity.getActionBar().setDisplayHomeAsUpEnabled(true);
activity.getActionBar().setHomeButtonEnabled(true);
- activity.getActionBar().setTitle(conversation.getName());
+ if (conversation.getMode() == Conversation.MODE_SINGLE || activity.useSubjectToIdentifyConference()) {
+ activity.getActionBar().setTitle(conversation.getName());
+ } else {
+ activity.getActionBar().setTitle(conversation.getContactJid().split("/")[0]);
+ }
activity.invalidateOptionsMenu();
}
}