From 16cafd0094d15669fa0e931a11481df3a7ae2f53 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Sat, 7 Mar 2015 21:22:54 +0100 Subject: [PATCH 1/6] Smack 4.1.0-rc4-SNAPSHOT --- version.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.gradle b/version.gradle index bd6730a81..0c944602b 100644 --- a/version.gradle +++ b/version.gradle @@ -1,7 +1,7 @@ allprojects { ext { - shortVersion = '4.1.0-rc3' - isSnapshot = false + shortVersion = '4.1.0-rc4' + isSnapshot = true jxmppVersion = '0.4.2-beta1' smackMinAndroidSdk = 8 From 92c76d1023238636ff8a5d34e09c6a76e02e84aa Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Tue, 10 Mar 2015 13:17:18 +0100 Subject: [PATCH 2/6] Only reset smSessionId if the stream is no longer resumeable --- .../java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java b/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java index b95b16132..0812fa5f4 100644 --- a/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java +++ b/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java @@ -513,6 +513,9 @@ public class XMPPTCPConnection extends AbstractXMPPConnection { disconnectedButResumeable = true; } else { disconnectedButResumeable = false; + // Reset the stream management session id to null, since if the stream is cleanly closed, i.e. sending a closing + // stream tag, there is no longer a stream to resume. + smSessionId = null; } authenticated = false; connected = false; @@ -520,9 +523,6 @@ public class XMPPTCPConnection extends AbstractXMPPConnection { reader = null; writer = null; - // Reset the stream management session id to null, since if the stream is cleanly closed, i.e. sending a closing - // stream tag, there is no longer a stream to resume. - smSessionId = null; maybeCompressFeaturesReceived.init(); compressSyncPoint.init(); smResumedSyncPoint.init(); From d389b4db201c446fca44c69f5594dfd78c0cc769 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Tue, 10 Mar 2015 13:21:16 +0100 Subject: [PATCH 3/6] Fix NPE in EntityCapsManager persistentCache may be null. --- .../java/org/jivesoftware/smackx/caps/EntityCapsManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/EntityCapsManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/EntityCapsManager.java index 75ffbf6f4..b8cfe1383 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/EntityCapsManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/EntityCapsManager.java @@ -199,7 +199,7 @@ public class EntityCapsManager extends Manager { DiscoverInfo info = CAPS_CACHE.get(nodeVer); // If it was not in CAPS_CACHE, try to retrieve the information from persistentCache - if (info == null) { + if (info == null && persistentCache != null) { info = persistentCache.lookup(nodeVer); // Promote the information to CAPS_CACHE if one was found if (info != null) { From 429af3b642b17bf1b8df2918045c9d6d284958bb Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Tue, 10 Mar 2015 13:50:51 +0100 Subject: [PATCH 4/6] Add VersionManager to startupClasses --- .../resources/org.jivesoftware.smack.extensions/extensions.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/smack-extensions/src/main/resources/org.jivesoftware.smack.extensions/extensions.xml b/smack-extensions/src/main/resources/org.jivesoftware.smack.extensions/extensions.xml index b6e64c901..36eaa40ed 100644 --- a/smack-extensions/src/main/resources/org.jivesoftware.smack.extensions/extensions.xml +++ b/smack-extensions/src/main/resources/org.jivesoftware.smack.extensions/extensions.xml @@ -16,5 +16,6 @@ org.jivesoftware.smackx.xdatalayout.XDataLayoutManager org.jivesoftware.smackx.xdatavalidation.XDataValidationManager org.jivesoftware.smackx.receipts.DeliveryReceiptManager + org.jivesoftware.smackx.iqversion.VersionManager From e85c1881d7370414b89c32ecd181208a94d0022f Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Tue, 10 Mar 2015 22:46:40 +0100 Subject: [PATCH 5/6] Add TypedCloneable --- .../jivesoftware/smack/packet/Message.java | 3 +- .../jivesoftware/smack/packet/Presence.java | 3 +- .../smack/util/TypedCloneable.java | 34 +++++++++++++++++++ .../smackx/disco/packet/DiscoverInfo.java | 7 ++-- 4 files changed, 42 insertions(+), 5 deletions(-) create mode 100644 smack-core/src/main/java/org/jivesoftware/smack/util/TypedCloneable.java diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/Message.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/Message.java index f08c3c653..eae77c265 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/packet/Message.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/Message.java @@ -24,6 +24,7 @@ import java.util.List; import java.util.Locale; import java.util.Set; +import org.jivesoftware.smack.util.TypedCloneable; import org.jivesoftware.smack.util.XmlStringBuilder; /** @@ -50,7 +51,7 @@ import org.jivesoftware.smack.util.XmlStringBuilder; * * @author Matt Tucker */ -public final class Message extends Stanza implements Cloneable { +public final class Message extends Stanza implements TypedCloneable { public static final String ELEMENT = "message"; public static final String BODY = "body"; diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/Presence.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/Presence.java index 7f347dd51..c50e35f74 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/packet/Presence.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/Presence.java @@ -20,6 +20,7 @@ package org.jivesoftware.smack.packet; import java.util.Locale; import org.jivesoftware.smack.util.Objects; +import org.jivesoftware.smack.util.TypedCloneable; import org.jivesoftware.smack.util.XmlStringBuilder; /** @@ -55,7 +56,7 @@ import org.jivesoftware.smack.util.XmlStringBuilder; * * @author Matt Tucker */ -public final class Presence extends Stanza implements Cloneable { +public final class Presence extends Stanza implements TypedCloneable { public static final String ELEMENT = "presence"; diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/TypedCloneable.java b/smack-core/src/main/java/org/jivesoftware/smack/util/TypedCloneable.java new file mode 100644 index 000000000..226b5e3d8 --- /dev/null +++ b/smack-core/src/main/java/org/jivesoftware/smack/util/TypedCloneable.java @@ -0,0 +1,34 @@ +/** + * + * Copyright 2015 Florian Schmaus + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jivesoftware.smack.util; + +/** + * An extended version of {@link java.lang.Cloneable}, which defines a generic {@link #clone()} + * method. + * + * @param the type returned by {@link #clone()}. + */ +public interface TypedCloneable extends Cloneable { + + /** + * Clone this instance. + * + * @return a cloned version of this instance. + */ + public T clone(); + +} diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverInfo.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverInfo.java index e4f5ca0f6..774259868 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverInfo.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverInfo.java @@ -18,6 +18,7 @@ package org.jivesoftware.smackx.disco.packet; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.util.StringUtils; +import org.jivesoftware.smack.util.TypedCloneable; import org.jivesoftware.smack.util.XmlStringBuilder; import org.jxmpp.util.XmppStringUtils; @@ -38,7 +39,7 @@ import java.util.Set; * * @author Gaston Dombiak */ -public class DiscoverInfo extends IQ implements Cloneable { +public class DiscoverInfo extends IQ implements TypedCloneable { public static final String ELEMENT = QUERY_ELEMENT; public static final String NAMESPACE = "http://jabber.org/protocol/disco#info"; @@ -266,7 +267,7 @@ public class DiscoverInfo extends IQ implements Cloneable { * attributes. * */ - public static class Identity implements Comparable, Cloneable { + public static class Identity implements Comparable, TypedCloneable { private final String category; private final String type; @@ -473,7 +474,7 @@ public class DiscoverInfo extends IQ implements Cloneable { * as well as specific feature types of interest, if any (e.g., for the purpose of feature * negotiation). */ - public static class Feature implements Cloneable { + public static class Feature implements TypedCloneable { private final String variable; From f6ba363843ec99ae02f9a6cfff76740bf87c2ad6 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Wed, 11 Mar 2015 12:36:15 +0100 Subject: [PATCH 6/6] Always include role in MUCItem if it's set As not including "role='none'" when kicking a user will result in an XMPPErrorException. Also there appears to be nothing in XEP-45 which says "if role is not set, then it defaults to 'none'". --- .../main/java/org/jivesoftware/smackx/muc/packet/MUCItem.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCItem.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCItem.java index 7f1630390..c8cfb9171 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCItem.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCItem.java @@ -148,9 +148,7 @@ public class MUCItem implements NamedElement { xml.optAttribute("affiliation", getAffiliation()); xml.optAttribute("jid", getJid()); xml.optAttribute("nick", getNick()); - if (role != null && role != MUCRole.none) { - xml.attribute("role", getRole()); - } + xml.optAttribute("role", getRole()); xml.rightAngleBracket(); xml.optElement("reason", getReason()); if (getActor() != null) {