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

fixed session objects not being build on start up

Browse source
This commit is contained in:
Daniel Gultsch 2015-10-30 12:05:21 +01:00
parent 6a458b853c
commit 34bcc59f72
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
View file

@ -323,7 +323,6 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
setTrustOnSessions(jid, newDevices, XmppAxolotlSession.Trust.INACTIVE_UNTRUSTED, setTrustOnSessions(jid, newDevices, XmppAxolotlSession.Trust.INACTIVE_UNTRUSTED,
XmppAxolotlSession.Trust.UNTRUSTED); XmppAxolotlSession.Trust.UNTRUSTED);
this.deviceIds.put(jid, deviceIds); this.deviceIds.put(jid, deviceIds);
findDevicesWithoutSession(jid);
mXmppConnectionService.keyStatusUpdated(null); mXmppConnectionService.keyStatusUpdated(null);
} }

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

@ -1088,8 +1088,8 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
public void run() { public void run() {
Log.d(Config.LOGTAG, "restoring roster"); Log.d(Config.LOGTAG, "restoring roster");
for (Account account : accounts) { for (Account account : accounts) {
account.initAccountServices(XmppConnectionService.this);
databaseBackend.readRoster(account.getRoster()); databaseBackend.readRoster(account.getRoster());
account.initAccountServices(XmppConnectionService.this); //roster needs to be loaded at this stage
} }
getBitmapCache().evictAll(); getBitmapCache().evictAll();
Looper.prepare(); Looper.prepare();