From 5edcb7714985e24e0a068eb0970135170f9a17ed Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Mon, 23 May 2016 20:25:01 +0200
Subject: Revert "Prevent presences from being cleared on connection"

This reverts commit 6a6112daeb5677594ab047f6fa6fe843b1b49f0c.
---
 .../java/eu/siacs/conversations/services/XmppConnectionService.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/main/java/eu')

diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 942ce2cc2..67370e3ff 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -265,6 +265,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 					}
 				}
 			}
+			account.getRoster().clearPresences();
 			mJingleConnectionManager.cancelInTransmission();
 			fetchRosterFromServer(account);
 			fetchBookmarks(account);
@@ -2243,7 +2244,6 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 				sendOfflinePresence(account);
 			}
 			account.getXmppConnection().disconnect(force);
-			account.getRoster().clearPresences();
 		}
 	}
 
@@ -2668,6 +2668,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 				scheduleWakeUpCall(Config.CONNECT_DISCO_TIMEOUT, account.getUuid().hashCode());
 			} else {
 				disconnect(account, force);
+				account.getRoster().clearPresences();
 				connection.resetEverything();
 				account.getAxolotlService().resetBrokenness();
 			}
-- 
cgit v1.2.3