From 89e92e1085c70ad55ee820477c8c002999c9ddbb Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Wed, 26 Apr 2017 20:21:09 +0200 Subject: while restoring state deal with conversations that don't have accounts --- .../de/pixart/messenger/services/XmppConnectionService.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/main/java/de/pixart/messenger/services/XmppConnectionService.java') diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java index 73c5039c6..a98f84336 100644 --- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java +++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java @@ -1560,9 +1560,15 @@ public class XmppConnectionService extends Service { accountLookupTable.put(account.getUuid(), account); } this.conversations.addAll(databaseBackend.getConversations(Conversation.STATUS_AVAILABLE)); - for (Conversation conversation : this.conversations) { + for (Iterator iterator = conversations.listIterator(); iterator.hasNext(); ) { + Conversation conversation = iterator.next(); Account account = accountLookupTable.get(conversation.getAccountUuid()); - conversation.setAccount(account); + if (account != null) { + conversation.setAccount(account); + } else { + Log.e(Config.LOGTAG, "unable to restore Conversations with " + conversation.getJid()); + iterator.remove(); + } } Runnable runnable = new Runnable() { @Override -- cgit v1.2.3