From fbd25c8129636219142b3b9bef6b794c269ea4bb Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 8 Mar 2014 04:18:58 +0100
Subject: [PATCH] roster version bug

---
 .../conversations/services/XmppConnectionService.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/eu/siacs/conversations/services/XmppConnectionService.java b/src/eu/siacs/conversations/services/XmppConnectionService.java
index 3fd8436e9..8d302a1ed 100644
--- a/src/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/eu/siacs/conversations/services/XmppConnectionService.java
@@ -176,11 +176,11 @@ public class XmppConnectionService extends Service {
 			if (accountChangedListener != null) {
 				accountChangedListener.onAccountListChangedListener();
 			}
-			if (account.getXmppConnection().hasFeatureRosterManagment()) {
-				updateRoster(account, null);
-			}
 			if (account.getStatus() == Account.STATUS_ONLINE) {
 				databaseBackend.clearPresences(account);
+				if (account.getXmppConnection().hasFeatureRosterManagment()) {
+					updateRoster(account, null);
+				}
 				connectMultiModeConversations(account);
 				List<Conversation> conversations = getConversations();
 				for (int i = 0; i < conversations.size(); ++i) {
@@ -613,10 +613,10 @@ public class XmppConnectionService extends Service {
 		query.setAttribute("xmlns", "jabber:iq:roster");
 		if (!"".equals(account.getRosterVersion())) {
 			Log.d(LOGTAG,account.getJid()+ ": fetching roster version "+account.getRosterVersion());
-			query.setAttribute("ver", account.getRosterVersion());
 		} else {
 			Log.d(LOGTAG,account.getJid()+": fetching roster");
 		}
+		query.setAttribute("ver", account.getRosterVersion());
 		iqPacket.addChild(query);
 		account.getXmppConnection().sendIqPacket(iqPacket,
 				new OnIqPacketReceived() {