narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests 1 Actions Packages Projects Releases 6 Wiki Activity

don't crash when selecting a conversation by uuid did not work

Browse source
This commit is contained in:
Daniel Gultsch 2015-01-10 19:43:23 +01:00
parent c89fdec0b1
commit 158f5dd17c
1 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
View file

@ -784,11 +784,9 @@ public class ConversationActivity extends XmppActivity
} else if (conversationList.size() <= 0) { } else if (conversationList.size() <= 0) {
startActivity(new Intent(this, StartConversationActivity.class)); startActivity(new Intent(this, StartConversationActivity.class));
finish(); finish();
} else if (getIntent() != null } else if (getIntent() != null && VIEW_CONVERSATION.equals(getIntent().getType())) {
&& VIEW_CONVERSATION.equals(getIntent().getType())) {
handleViewConversationIntent(getIntent()); handleViewConversationIntent(getIntent());
} else if (mOpenConverstaion != null) { } else if (selectConversationByUuid(mOpenConverstaion)) {
selectConversationByUuid(mOpenConverstaion);
if (mPanelOpen) { if (mPanelOpen) {
showConversationsOverview(); showConversationsOverview();
} else { } else {
@ -823,9 +821,9 @@ public class ConversationActivity extends XmppActivity
String uuid = (String) intent.getExtras().get(CONVERSATION); String uuid = (String) intent.getExtras().get(CONVERSATION);
String text = intent.getExtras().getString(TEXT, ""); String text = intent.getExtras().getString(TEXT, "");
String nick = intent.getExtras().getString(NICK,null); String nick = intent.getExtras().getString(NICK,null);
selectConversationByUuid(uuid); if (selectConversationByUuid(uuid)) {
this.mConversationFragment.reInit(getSelectedConversation()); this.mConversationFragment.reInit(getSelectedConversation());
if (nick!=null) { if (nick != null) {
this.mConversationFragment.highlightInConference(nick); this.mConversationFragment.highlightInConference(nick);
} else { } else {
this.mConversationFragment.appendText(text); this.mConversationFragment.appendText(text);
@ -836,13 +834,19 @@ public class ConversationActivity extends XmppActivity
updateActionBarTitle(true); //fixes bug where slp isn't properly closed yet updateActionBarTitle(true); //fixes bug where slp isn't properly closed yet
} }
} }
}
private void selectConversationByUuid(String uuid) { private boolean selectConversationByUuid(String uuid) {
if (uuid == null) {
return false;
}
for (Conversation aConversationList : conversationList) { for (Conversation aConversationList : conversationList) {
if (aConversationList.getUuid().equals(uuid)) { if (aConversationList.getUuid().equals(uuid)) {
setSelectedConversation(aConversationList); setSelectedConversation(aConversationList);
return true;
} }
} }
return false;
} }
@Override @Override