diff options
Diffstat (limited to 'src/main/java/eu/siacs/conversations')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ConversationActivity.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java index 0277f155d..0f9761e52 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java @@ -235,15 +235,16 @@ public class ConversationActivity extends XmppActivity implements } private void updateActionBarTitle(boolean titleShouldBeName) { - ActionBar ab = getActionBar(); + final ActionBar ab = getActionBar(); + final Conversation conversation = getSelectedConversation(); if (ab != null) { - if (titleShouldBeName) { + if (titleShouldBeName && conversation != null) { ab.setDisplayHomeAsUpEnabled(true); ab.setHomeButtonEnabled(true); - if (getSelectedConversation().getMode() == Conversation.MODE_SINGLE || useSubjectToIdentifyConference()) { - ab.setTitle(getSelectedConversation().getName()); + if (conversation.getMode() == Conversation.MODE_SINGLE || useSubjectToIdentifyConference()) { + ab.setTitle(conversation.getName()); } else { - ab.setTitle(getSelectedConversation().getContactJid().toBareJid().toString()); + ab.setTitle(conversation.getContactJid().toBareJid().toString()); } } else { ab.setDisplayHomeAsUpEnabled(false); |