sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed npe. fixed #717

This commit is contained in:
iNPUTmice 2014-11-27 10:30:06 +01:00
parent 2f02d8d398
commit 7ba41c6a8e
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
View File

@ -235,15 +235,16 @@ public class ConversationActivity extends XmppActivity implements
} }
private void updateActionBarTitle(boolean titleShouldBeName) { private void updateActionBarTitle(boolean titleShouldBeName) {
ActionBar ab = getActionBar(); final ActionBar ab = getActionBar();
final Conversation conversation = getSelectedConversation();
if (ab != null) { if (ab != null) {
if (titleShouldBeName) { if (titleShouldBeName && conversation != null) {
ab.setDisplayHomeAsUpEnabled(true); ab.setDisplayHomeAsUpEnabled(true);
ab.setHomeButtonEnabled(true); ab.setHomeButtonEnabled(true);
if (getSelectedConversation().getMode() == Conversation.MODE_SINGLE || useSubjectToIdentifyConference()) { if (conversation.getMode() == Conversation.MODE_SINGLE || useSubjectToIdentifyConference()) {
ab.setTitle(getSelectedConversation().getName()); ab.setTitle(conversation.getName());
} else { } else {
ab.setTitle(getSelectedConversation().getContactJid().toBareJid().toString()); ab.setTitle(conversation.getContactJid().toBareJid().toString());
} }
} else { } else {
ab.setDisplayHomeAsUpEnabled(false); ab.setDisplayHomeAsUpEnabled(false);