Fix for SMACK-371:

- http://issues.igniterealtime.org/browse/SMACK-371 - http://community.igniterealtime.org/thread/47534?tstart=0 Credits and thanks go to Colby White for reporting this. Newer versions for XEP-0045 (MUC) use muc#admin for all onwer related operations.
Flowdalic · Mar 31, 2012 · 147a4b0 · 147a4b0
1 parent 8fbe7cd
commit 147a4b0
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/source/org/jivesoftware/smackx/muc/MultiUserChat.java b/source/org/jivesoftware/smackx/muc/MultiUserChat.java
@@ -1276,7 +1276,7 @@ public void revokeModerator(String nickname) throws XMPPException {
      * @throws XMPPException if an error occurs granting ownership privileges to a user.
      */
     public void grantOwnership(Collection<String> jids) throws XMPPException {
-        changeAffiliationByOwner(jids, "owner");
+        changeAffiliationByAdmin(jids, "owner");
     }
 
     /**
@@ -1289,7 +1289,7 @@ public void grantOwnership(Collection<String> jids) throws XMPPException {
      * @throws XMPPException if an error occurs granting ownership privileges to a user.
      */
     public void grantOwnership(String jid) throws XMPPException {
-        changeAffiliationByOwner(jid, "owner");
+        changeAffiliationByAdmin(jid, "owner", null);
     }
 
     /**
@@ -1301,7 +1301,7 @@ public void grantOwnership(String jid) throws XMPPException {
      * @throws XMPPException if an error occurs revoking ownership privileges from a user.
      */
     public void revokeOwnership(Collection<String> jids) throws XMPPException {
-        changeAffiliationByOwner(jids, "admin");
+        changeAffiliationByAdmin(jids, "admin");
     }
 
     /**
@@ -1313,7 +1313,7 @@ public void revokeOwnership(Collection<String> jids) throws XMPPException {
      * @throws XMPPException if an error occurs revoking ownership privileges from a user.
      */
     public void revokeOwnership(String jid) throws XMPPException {
-        changeAffiliationByOwner(jid, "admin");
+        changeAffiliationByAdmin(jid, "admin", null);
     }
 
     /**
@@ -1431,7 +1431,8 @@ private void changeAffiliationByAdmin(String jid, String affiliation, String rea
         // Set the new affiliation.
         MUCAdmin.Item item = new MUCAdmin.Item(affiliation, null);
         item.setJid(jid);
-        item.setReason(reason);
+        if(reason != null)
+            item.setReason(reason);
         iq.addItem(item);
 
         // Wait for a response packet back from the server.
@@ -1632,7 +1633,7 @@ public void removeParticipantListener(PacketListener listener) {
      *         don't have enough privileges to get this information.
      */
     public Collection<Affiliate> getOwners() throws XMPPException {
-        return getAffiliatesByOwner("owner");
+        return getAffiliatesByAdmin("owner");
     }
 
     /**