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

Postpone initAccountService until roster loaded 

The AxolotlService depends on the roster being loaded when it is
initialized so that it can fill its in-memory SessionMap.
This commit is contained in:
Andreas Straub 2015-07-09 14:18:54 +02:00
parent ce4b86e6d4
commit b1e719bd8b
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -593,9 +593,6 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
this.databaseBackend = DatabaseBackend.getInstance(getApplicationContext()); this.databaseBackend = DatabaseBackend.getInstance(getApplicationContext());
this.accounts = databaseBackend.getAccounts(); this.accounts = databaseBackend.getAccounts();
for (final Account account : this.accounts) {
account.initAccountServices(this);
}
restoreFromDatabase(); restoreFromDatabase();
getContentResolver().registerContentObserver(ContactsContract.Contacts.CONTENT_URI, true, contactObserver); getContentResolver().registerContentObserver(ContactsContract.Contacts.CONTENT_URI, true, contactObserver);
@ -955,6 +952,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
Log.d(Config.LOGTAG,"restoring roster"); Log.d(Config.LOGTAG,"restoring roster");
for(Account account : accounts) { for(Account account : accounts) {
databaseBackend.readRoster(account.getRoster()); databaseBackend.readRoster(account.getRoster());
account.initAccountServices(XmppConnectionService.this);
} }
getBitmapCache().evictAll(); getBitmapCache().evictAll();
Looper.prepare(); Looper.prepare();