4 files changed, 54 insertions, 30 deletions
diff --git a/src/com/isode/stroke/queries/GetRosterRequest.java b/src/com/isode/stroke/queries/GetRosterRequest.java
deleted file mode 100644
index 4501a94..0000000
--- a/src/com/isode/stroke/queries/GetRosterRequest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2010, Isode Limited, London, England.
- * All rights reserved.
- */
-/*
- * Copyright (c) 2010, Remko Tronçon.
- * All rights reserved.
- */
-
-package com.isode.stroke.queries;
-
-import com.isode.stroke.elements.IQ.Type;
-import com.isode.stroke.elements.RosterPayload;
-import com.isode.stroke.jid.JID;
-
-public class GetRosterRequest extends GenericRequest<RosterPayload> {
-    public GetRosterRequest(JID target, IQRouter iqRouter) {
-        super(Type.Get, target, new RosterPayload(), iqRouter);
-    }
-
-    public GetRosterRequest(IQRouter iqRouter) {
-        super(Type.Get, new JID(), new RosterPayload(), iqRouter);
-    }
-}
diff --git a/src/com/isode/stroke/queries/IQRouter.java b/src/com/isode/stroke/queries/IQRouter.java
index 409d02b..0dd55f2 100644
--- a/src/com/isode/stroke/queries/IQRouter.java
+++ b/src/com/isode/stroke/queries/IQRouter.java
@@ -1,9 +1,5 @@
 /*
- * Copyright (c) 2010-2014, Isode Limited, London, England.
- * All rights reserved.
- */
-/*
- * Copyright (c) 2010, Remko Tronçon.
+ * Copyright (c) 2010-2015, Isode Limited, London, England.
  * All rights reserved.
  */
 package com.isode.stroke.queries;
@@ -63,7 +59,17 @@ public class IQRouter {
         return channel_.isAvailable();
     }
 
-    private void handleIQ(IQ iq) {
+	/**
+	 * Checks whether the given jid is the account JID (i.e. it is either
+	 * the bare JID, or it is the empty JID).
+	 * Can be used to check whether a stanza is sent by the server on behalf
+	 * of the user's account.
+	 */
+    public boolean isAccountJID(final JID jid) {
+		return jid.isValid() ? jid_.toBare().compare(jid, JID.CompareType.WithResource) == 0 : true;
+	}
+
+	private void handleIQ(IQ iq) {
         boolean handled = false;
         synchronized (handlers_) {
             for (IQHandler handler : handlers_) {
diff --git a/src/com/isode/stroke/queries/SetResponder.java b/src/com/isode/stroke/queries/SetResponder.java
new file mode 100644
index 0000000..c042385
--- /dev/null
+++ b/src/com/isode/stroke/queries/SetResponder.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2010-2015, Isode Limited, London, England.
+ * All rights reserved.
+ */
+package com.isode.stroke.queries;
+
+import com.isode.stroke.elements.Payload;
+import com.isode.stroke.jid.JID;
+
+public abstract class SetResponder<T extends Payload> extends Responder<T> {
+
+	public SetResponder(T payloadType, IQRouter router) {
+		super(payloadType, router);
+	}
+
+	@Override
+	protected boolean handleGetRequest(JID from, JID to, String id, T payload) {
+		return false;
+	}
+}
diff --git a/src/com/isode/stroke/queries/requests/GetSecurityLabelsCatalogRequest.java b/src/com/isode/stroke/queries/requests/GetSecurityLabelsCatalogRequest.java
new file mode 100644
index 0000000..fdadc9b
--- /dev/null
+++ b/src/com/isode/stroke/queries/requests/GetSecurityLabelsCatalogRequest.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2010-2015, Isode Limited, London, England.
+ * All rights reserved.
+ */
+package com.isode.stroke.queries.requests;
+
+import com.isode.stroke.elements.IQ;
+import com.isode.stroke.elements.SecurityLabelsCatalog;
+import com.isode.stroke.jid.JID;
+import com.isode.stroke.queries.GenericRequest;
+import com.isode.stroke.queries.IQRouter;
+
+public class GetSecurityLabelsCatalogRequest extends GenericRequest<SecurityLabelsCatalog>{
+
+	public static GetSecurityLabelsCatalogRequest create(JID recipient, IQRouter router) {
+		return new GetSecurityLabelsCatalogRequest(recipient, router);
+	}
+	
+	private GetSecurityLabelsCatalogRequest(JID recipient, IQRouter router) {
+		super(IQ.Type.Get, new JID(), new SecurityLabelsCatalog(recipient), router);
+	}
+}