1 files changed, 21 insertions, 4 deletions

diff --git a/src/eu/siacs/conversations/services/XmppConnectionService.java b/src/eu/siacs/conversations/services/XmppConnectionService.java
index 9993dd67..6c652f8d 100644
--- a/src/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/eu/siacs/conversations/services/XmppConnectionService.java
@@ -2,6 +2,7 @@ package eu.siacs.conversations.services;
 
 import java.security.SecureRandom;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
@@ -430,6 +431,7 @@ public class XmppConnectionService extends Service {
 					contact.resetOption(Contact.Options.DIRTY_DELETE);
 				} else {
 					contact.setOption(Contact.Options.IN_ROSTER);
+					contact.resetOption(Contact.Options.DIRTY_PUSH);
 					contact.parseSubscriptionFromElement(item);
 				}
 			}
@@ -1262,6 +1264,7 @@ public class XmppConnectionService extends Service {
 
 	public void pushContactToServer(Contact contact) {
 		contact.resetOption(Contact.Options.DIRTY_DELETE);
+		contact.setOption(Contact.Options.DIRTY_PUSH);
 		Account account = contact.getAccount();
 		if (account.getStatus() == Account.STATUS_ONLINE) {
 			IqPacket iq = new IqPacket(IqPacket.TYPE_SET);
@@ -1274,9 +1277,6 @@ public class XmppConnectionService extends Service {
 				Log.d("xmppService", "contact had pending subscription");
 				sendPresenceUpdatesTo(contact);
 			}
-			contact.resetOption(Contact.Options.DIRTY_PUSH);
-		} else {
-			contact.setOption(Contact.Options.DIRTY_PUSH);
 		}
 	}
 
@@ -1290,7 +1290,6 @@ public class XmppConnectionService extends Service {
 			item.setAttribute("jid", contact.getJid());
 			item.setAttribute("subscription", "remove");
 			account.getXmppConnection().sendIqPacket(iq, null);
-			contact.resetOption(Contact.Options.DIRTY_DELETE);
 		}
 	}
 
@@ -1496,4 +1495,22 @@ public class XmppConnectionService extends Service {
 		}).start();
 		
 	}
+	
+	public List<String> getKnownHosts() {
+		List<String> hosts = new ArrayList<String>();
+		for(Account account : getAccounts()) {
+			if (!hosts.contains(account.getServer())) {
+				hosts.add(account.getServer());
+			}
+			for(Contact contact : account.getRoster().getContacts()) {
+				if (contact.showInRoster()) {
+					String server = contact.getServer();
+					if (server!=null && !hosts.contains(server)) {
+						hosts.add(server);
+					}
+				}
+			}
+		}
+		return hosts;
+	}
 }