2 files changed, 91 insertions, 8 deletions

diff --git a/src/eu/siacs/conversations/parser/IqParser.java b/src/eu/siacs/conversations/parser/IqParser.java
new file mode 100644
index 00000000..acbeee4d
--- /dev/null
+++ b/src/eu/siacs/conversations/parser/IqParser.java
@@ -0,0 +1,89 @@
+package eu.siacs.conversations.parser;
+
+import eu.siacs.conversations.entities.Account;
+import eu.siacs.conversations.entities.Contact;
+import eu.siacs.conversations.services.XmppConnectionService;
+import eu.siacs.conversations.xml.Element;
+import eu.siacs.conversations.xmpp.OnIqPacketReceived;
+import eu.siacs.conversations.xmpp.stanzas.IqPacket;
+
+public class IqParser extends AbstractParser implements OnIqPacketReceived {
+
+	public IqParser(XmppConnectionService service) {
+		super(service);
+	}
+	
+	public void rosterItems(Account account, Element query) {
+		String version = query.getAttribute("ver");
+		if (version != null) {
+			account.getRoster().setVersion(version);
+		}
+		for (Element item : query.getChildren()) {
+			if (item.getName().equals("item")) {
+				String jid = item.getAttribute("jid");
+				String name = item.getAttribute("name");
+				String subscription = item.getAttribute("subscription");
+				Contact contact = account.getRoster().getContact(jid);
+				if (!contact.getOption(Contact.Options.DIRTY_PUSH)) {
+					contact.setServerName(name);
+				}
+				if (subscription.equals("remove")) {
+					contact.resetOption(Contact.Options.IN_ROSTER);
+					contact.resetOption(Contact.Options.DIRTY_DELETE);
+					contact.resetOption(Contact.Options.PREEMPTIVE_GRANT);
+				} else {
+					contact.setOption(Contact.Options.IN_ROSTER);
+					contact.resetOption(Contact.Options.DIRTY_PUSH);
+					contact.parseSubscriptionFromElement(item);
+				}
+			}
+		}
+	}
+
+	@Override
+	public void onIqPacketReceived(Account account, IqPacket packet) {
+		if (packet.hasChild("query", "jabber:iq:roster")) {
+			String from = packet.getFrom();
+			if ((from == null) || (from.equals(account.getJid()))) {
+				Element query = packet.findChild("query");
+				this.rosterItems(account, query);
+			}
+		} else if (packet
+				.hasChild("open", "http://jabber.org/protocol/ibb")
+				|| packet
+						.hasChild("data", "http://jabber.org/protocol/ibb")) {
+			mXmppConnectionService.getJingleConnectionManager().deliverIbbPacket(account, packet);
+		} else if (packet.hasChild("query",
+				"http://jabber.org/protocol/disco#info")) {
+			IqPacket iqResponse = packet
+					.generateRespone(IqPacket.TYPE_RESULT);
+			Element query = iqResponse.addChild("query",
+					"http://jabber.org/protocol/disco#info");
+			query.addChild("feature").setAttribute("var",
+					"urn:xmpp:jingle:1");
+			query.addChild("feature").setAttribute("var",
+					"urn:xmpp:jingle:apps:file-transfer:3");
+			query.addChild("feature").setAttribute("var",
+					"urn:xmpp:jingle:transports:s5b:1");
+			query.addChild("feature").setAttribute("var",
+					"urn:xmpp:jingle:transports:ibb:1");
+			if (mXmppConnectionService.confirmMessages()) {
+				query.addChild("feature").setAttribute("var",
+						"urn:xmpp:receipts");
+			}
+			account.getXmppConnection().sendIqPacket(iqResponse, null);
+		} else {
+			if ((packet.getType() == IqPacket.TYPE_GET)
+					|| (packet.getType() == IqPacket.TYPE_SET)) {
+				IqPacket response = packet
+						.generateRespone(IqPacket.TYPE_ERROR);
+				Element error = response.addChild("error");
+				error.setAttribute("type", "cancel");
+				error.addChild("feature-not-implemented",
+						"urn:ietf:params:xml:ns:xmpp-stanzas");
+				account.getXmppConnection().sendIqPacket(response, null);
+			}
+		}
+	}
+
+}
diff --git a/src/eu/siacs/conversations/parser/PresenceParser.java b/src/eu/siacs/conversations/parser/PresenceParser.java
index 8fb97bd8..cce96b3b 100644
--- a/src/eu/siacs/conversations/parser/PresenceParser.java
+++ b/src/eu/siacs/conversations/parser/PresenceParser.java
@@ -13,12 +13,9 @@ import eu.siacs.conversations.xmpp.stanzas.PresencePacket;
 
 public class PresenceParser extends AbstractParser implements
 		OnPresencePacketReceived {
-
-	private PresenceGenerator mPresenceGenerator;
 	
 	public PresenceParser(XmppConnectionService service) {
 		super(service);
-		mPresenceGenerator = service.getPresenceGenerator();
 	}
 
 	public void parseConferencePresence(PresencePacket packet, Account account) {
@@ -43,6 +40,7 @@ public class PresenceParser extends AbstractParser implements
 	}
 
 	public void parseContactPresence(PresencePacket packet, Account account) {
+		PresenceGenerator mPresenceGenerator = mXmppConnectionService.getPresenceGenerator();
 		if (packet.getFrom() == null) {
 			return;
 		}
@@ -95,11 +93,7 @@ public class PresenceParser extends AbstractParser implements
 						.onContactStatusChanged(contact, false);
 			} else if (type.equals("subscribe")) {
 				if (contact.getOption(Contact.Options.PREEMPTIVE_GRANT)) {
-					mXmppConnectionService.sendPresencePacket(account, mPresenceGenerator.stopPresenceUpdatesTo(contact));
-					if ((contact.getOption(Contact.Options.ASKING))
-							&& (!contact.getOption(Contact.Options.TO))) {
-						mXmppConnectionService.sendPresencePacket(account,mPresenceGenerator.requestPresenceUpdatesFrom(contact));
-					}
+					mXmppConnectionService.sendPresencePacket(account, mPresenceGenerator.sendPresenceUpdatesTo(contact));
 				} else {
 					contact.setOption(Contact.Options.PENDING_SUBSCRIPTION_REQUEST);
 				}