From ae46f653fddb3813a1b94c44115a10261286e52e Mon Sep 17 00:00:00 2001 From: dave-stanley Date: Tue, 2 Jan 2018 15:42:33 +0000 Subject: [PATCH 1/4] Fix for extra quote in workgroup IQs At some point IQChildElementXmlStringBuilder was modified to add the closing quote around the namespace. this was not reflected in these element extensions --- .../org/jivesoftware/smackx/workgroup/packet/OccupantsInfo.java | 2 +- .../jivesoftware/smackx/workgroup/packet/RoomInvitation.java | 2 +- .../org/jivesoftware/smackx/workgroup/packet/RoomTransfer.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OccupantsInfo.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OccupantsInfo.java index e0b587b22..f7579cc6a 100644 --- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OccupantsInfo.java +++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OccupantsInfo.java @@ -80,7 +80,7 @@ public class OccupantsInfo extends IQ { @Override protected IQChildElementXmlStringBuilder getIQChildElementBuilder(IQChildElementXmlStringBuilder buf) { - buf.append("\" roomID=\"").append(roomID).append("\">"); + buf.append(" roomID=\"").append(roomID).append("\">"); synchronized (occupants) { for (OccupantInfo occupant : occupants) { buf.append(""); diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomInvitation.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomInvitation.java index 3cf62029d..e48a7610d 100644 --- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomInvitation.java +++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomInvitation.java @@ -115,7 +115,7 @@ public class RoomInvitation implements ExtensionElement { } public IQ.IQChildElementXmlStringBuilder getIQChildElementBuilder(IQChildElementXmlStringBuilder buf) { - buf.append("\" type=\"").append(type.name()).append("\">"); + buf.append(" type=\"").append(type.name()).append("\">"); buf.append(""); if (invitee != null) { buf.append("").append(invitee).append(""); diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomTransfer.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomTransfer.java index 2ad53cc8b..70fda6ad2 100644 --- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomTransfer.java +++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomTransfer.java @@ -115,7 +115,7 @@ public class RoomTransfer implements ExtensionElement { } public IQ.IQChildElementXmlStringBuilder getIQChildElementBuilder(IQChildElementXmlStringBuilder buf) { - buf.append("\" type=\"").append(type.name()).append("\">"); + buf.append(" type=\"").append(type.name()).append("\">"); buf.append(""); if (invitee != null) { buf.append("").append(invitee).append(""); From 93683389e325621d5135d20bd267ecdaa2aa8fbb Mon Sep 17 00:00:00 2001 From: lohse Date: Fri, 19 Jan 2018 11:38:17 +0100 Subject: [PATCH 2/4] Bugfix in SOCKS5 authentication Read password bytes from the correct field. Fixes SMACK-796, introduced with 4c64643 --- .../jivesoftware/smack/proxy/Socks5ProxySocketConnection.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smack-core/src/main/java/org/jivesoftware/smack/proxy/Socks5ProxySocketConnection.java b/smack-core/src/main/java/org/jivesoftware/smack/proxy/Socks5ProxySocketConnection.java index 053c1a67e..33c887ea2 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/proxy/Socks5ProxySocketConnection.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/proxy/Socks5ProxySocketConnection.java @@ -137,7 +137,7 @@ public class Socks5ProxySocketConnection implements ProxySocketConnection { System.arraycopy(userBytes, 0, buf, index, user.length()); index += user.length(); - byte[] passwordBytes = user.getBytes(StringUtils.UTF8); + byte[] passwordBytes = passwd.getBytes(StringUtils.UTF8); buf[index++] = (byte) (passwordBytes.length); System.arraycopy(passwordBytes, 0, buf, index, passwd.length()); From 4ca2f84d411ef9745e3f8302cfed4e2e71078192 Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Tue, 23 Jan 2018 16:31:43 +0100 Subject: [PATCH 3/4] Fix typo in example --- documentation/extensions/muc.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/extensions/muc.md b/documentation/extensions/muc.md index 207fcd83d..211d117c3 100644 --- a/documentation/extensions/muc.md +++ b/documentation/extensions/muc.md @@ -27,7 +27,7 @@ EntityBareJid mucJid = JidCreate.bareFrom("myroom@conference.jabber.org"); Resourcepart nickname = Resourcepart.from("testbot"); // A other use (we may invite him to a MUC). -FullJid otherJid = JidCreate.fullFromm("user3@host.org/Smack"); +FullJid otherJid = JidCreate.fullFrom("user3@host.org/Smack"); ``` Create a new Room From 1de9d3dee07264ed8e510baefb7cb4967d3351a4 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Wed, 7 Feb 2018 21:19:01 +0100 Subject: [PATCH 4/4] Smack 4.2.3 --- resources/releasedocs/changelog.html | 17 +++++++++++++++++ version.gradle | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/resources/releasedocs/changelog.html b/resources/releasedocs/changelog.html index 9e95e8297..91fecaa6d 100644 --- a/resources/releasedocs/changelog.html +++ b/resources/releasedocs/changelog.html @@ -143,6 +143,23 @@ hr { +

4.2.3 -- 2018-02-07

+ +

Bug +

+
    +
  • [SMACK-788] - NullPointerException if hostAddresses is null +
    • +
  • [SMACK-789] - AffiliationsExtension toXml() produces invalid XML +
    • +
  • [SMACK-790] - Some HTTP File Upload elements are not correctly parsed and serialized +
    • +
  • [SMACK-791] - NumberFormatException in IpAddressUtil.isIPv4LiteralAddress +
    • +
  • [SMACK-796] - SOCKS5 authentication erroneously uses 'user' when it should use 'passwd', causes authentication to fail +
    • +
+

4.2.2 -- 2017-11-25

Bug diff --git a/version.gradle b/version.gradle index efbe1d7c8..2a7c279ea 100644 --- a/version.gradle +++ b/version.gradle @@ -1,7 +1,7 @@ allprojects { ext { shortVersion = '4.2.3' - isSnapshot = true + isSnapshot = false jxmppVersion = '0.6.0' smackMinAndroidSdk = 8 }