1 files changed, 13 insertions, 12 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java b/src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java
index dda3c7b9..c1426080 100644
--- a/src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java
+++ b/src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java
@@ -455,7 +455,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 					}
 					return START_STICKY;
 				case Intent.ACTION_SHUTDOWN:
-					logoutAndSave();
+					logoutAndSave(true);
 					return START_NOT_STICKY;
 				case ACTION_CLEAR_NOTIFICATION:
 					mNotificationService.clear();
@@ -738,12 +738,16 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 	public void onTaskRemoved(final Intent rootIntent) {
 		super.onTaskRemoved(rootIntent);
 		if (!ConversationsPlusPreferences.keepForegroundService()) {
-			this.logoutAndSave();
+			this.logoutAndSave(false);
 		}
 	}
 
-	private void logoutAndSave() {
+	private void logoutAndSave(boolean stop) {
+		int activeAccounts = 0;
 		for (final Account account : accounts) {
+			if (account.getStatus() != Account.State.DISABLED) {
+				activeAccounts++;
+			}
 			databaseBackend.writeRoster(account.getRoster());
 			if (account.getXmppConnection() != null) {
 				new Thread(new Runnable() {
@@ -752,11 +756,12 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 						disconnect(account, false);
 					}
 				}).start();
-				cancelWakeUpCall(account.getUuid().hashCode());
 			}
 		}
-		Logging.d(Config.LOGTAG, "good bye");
-		stopSelf();
+		if (stop || activeAccounts == 0) {
+			Logging.d(Config.LOGTAG, "good bye");
+			stopSelf();
+		}
 	}
 
 	private void cancelWakeUpCall(int requestCode) {
@@ -789,6 +794,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		connection.setOnBindListener(this.mOnBindListener);
 		connection.setOnMessageAcknowledgeListener(this.mOnMessageAcknowledgedListener);
 		connection.addOnAdvancedStreamFeaturesAvailableListener(this.mMessageArchiveService);
+		connection.addOnAdvancedStreamFeaturesAvailableListener(AvatarService.getInstance());
 		AxolotlService axolotlService = account.getAxolotlService();
 		if (axolotlService != null) {
 			connection.addOnAdvancedStreamFeaturesAvailableListener(axolotlService);
@@ -2331,12 +2337,6 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 			if (!account.isOptionSet(Account.OPTION_DISABLED)) {
 				if (!force) {
 					disconnect(account, false);
-					try {
-						Logging.d(Config.LOGTAG, "wait for disconnect");
-						Thread.sleep(500); //sleep  wait for disconnect
-					} catch (InterruptedException e) {
-						//ignored
-					}
 				}
 				Thread thread = new Thread(connection);
 				connection.setInteractive(interactive);
@@ -2347,6 +2347,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 				disconnect(account, force);
 				account.getRoster().clearPresences();
 				connection.resetEverything();
+				account.getAxolotlService().resetBrokenness();
 			}
 		}
 	}