summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Clayton <alex.clayton@isode.com>2017-11-08 14:42:11 (GMT)
committerAlex Clayton <alex.clayton@isode.com>2017-11-15 09:49:21 (GMT)
commitbf4830bc9f51a27aba59bc5708caddb835e84789 (patch)
tree290f32d5d70112f977bed17eff366a858bd3f298
parent329d7f7cf1b425540b0fa625799d21573d14b149 (diff)
downloadstroke-bf4830bc9f51a27aba59bc5708caddb835e84789.zip
stroke-bf4830bc9f51a27aba59bc5708caddb835e84789.tar.bz2
Allow affiliations on full jidsHEADmaster
Allow affiliations to be set on full jids. This is so we can set affiliations for group (which use full JIDS to identify themselves). Test-information: Works with Gurmeen's group affiliation patch for MLC Change-Id: I74a4977a044bbb4ea031def0072c6c42b7c0c976
-rw-r--r--src/com/isode/stroke/muc/MUCImpl.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/isode/stroke/muc/MUCImpl.java b/src/com/isode/stroke/muc/MUCImpl.java
index 26be309..2a45926 100644
--- a/src/com/isode/stroke/muc/MUCImpl.java
+++ b/src/com/isode/stroke/muc/MUCImpl.java
@@ -106,7 +106,9 @@ public class MUCImpl extends MUC {
/**
* Change the affiliation of the given Jabber ID.
* It must be called with the real JID, not the room JID.
- * @param jid real jabber ID, not null
+ * @param jid real jabber ID, not null. NOTE: This method does not
+ strip any resource from the JID, as expected by XEP-0045. Callers
+ wanting to be strictly XEP-0045 conformant should pass in a bare JID
* @param affiliation new affiliation, not null
*/
@Override
@@ -114,7 +116,9 @@ public class MUCImpl extends MUC {
final MUCAdminPayload mucPayload = new MUCAdminPayload();
MUCItem item = new MUCItem();
item.affiliation = affiliation;
- item.realJID = jid.toBare();
+ // According to XEP-0045 the JID should be bare, but this isn't being done here because
+ // to provide support for applications where we do want to set affilations on a per resource basis
+ item.realJID = jid;
mucPayload.addItem(item);
GenericRequest<MUCAdminPayload> request = new GenericRequest<MUCAdminPayload>(
IQ.Type.Set, getJID(), mucPayload, iqRouter_);