fixed session objects not being build on start up

Daniel Gultsch created 10 years ago

Change summary

src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java  | 1 
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | 2 
2 files changed, 1 insertion(+), 2 deletions(-)

Detailed changes

src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java

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

src/main/java/eu/siacs/conversations/services/XmppConnectionService.java

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