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

fixed npe for broken bookmarks

This commit is contained in:
iNPUTmice 2014-11-29 19:09:28 +01:00
parent 5d7597438b
commit d98486d1ca
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
View File

@ -813,8 +813,7 @@ public class XmppConnectionService extends Service {
Conversation conversation = find(bookmark); Conversation conversation = find(bookmark);
if (conversation != null) { if (conversation != null) {
conversation.setBookmark(bookmark); conversation.setBookmark(bookmark);
} else { } else if (bookmark.autojoin() && bookmark.getJid() != null) {
if (bookmark.autojoin()) {
conversation = findOrCreateConversation( conversation = findOrCreateConversation(
account, bookmark.getJid(), true); account, bookmark.getJid(), true);
conversation.setBookmark(bookmark); conversation.setBookmark(bookmark);
@ -823,7 +822,6 @@ public class XmppConnectionService extends Service {
} }
} }
} }
}
account.setBookmarks(bookmarks); account.setBookmarks(bookmarks);
} }
}; };
@ -980,6 +978,9 @@ public class XmppConnectionService extends Service {
public Conversation find(final List<Conversation> haystack, public Conversation find(final List<Conversation> haystack,
final Account account, final Account account,
final Jid jid) { final Jid jid) {
if (jid == null ) {
return null;
}
for (Conversation conversation : haystack) { for (Conversation conversation : haystack) {
if ((account == null || conversation.getAccount() == account) if ((account == null || conversation.getAccount() == account)
&& (conversation.getContactJid().toBareJid().equals(jid.toBareJid()))) { && (conversation.getContactJid().toBareJid().equals(jid.toBareJid()))) {