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

while restoring state deal with conversations that don't have accounts

Browse source
This commit is contained in:
Daniel Gultsch 2017-04-25 18:17:23 +02:00
parent 8e0fb6a23a
commit a55d0a691c
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
View file

@ -1450,9 +1450,15 @@ public class XmppConnectionService extends Service {
accountLookupTable.put(account.getUuid(), account); accountLookupTable.put(account.getUuid(), account);
} }
this.conversations.addAll(databaseBackend.getConversations(Conversation.STATUS_AVAILABLE)); this.conversations.addAll(databaseBackend.getConversations(Conversation.STATUS_AVAILABLE));
for (Conversation conversation : this.conversations) { for(Iterator<Conversation> iterator = conversations.listIterator(); iterator.hasNext();) {
Conversation conversation = iterator.next();
Account account = accountLookupTable.get(conversation.getAccountUuid()); 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() { Runnable runnable = new Runnable() {
@Override @Override