Browse Source

Merge branch '4.4'

master
Florian Schmaus 8 months ago
parent
commit
fa88f78232
  1. 6
      NOTICE
  2. 3
      smack-bosh/src/main/java/org/jivesoftware/smack/bosh/XMPPBOSHConnection.java
  3. 13
      smack-core/src/main/java/org/jivesoftware/smack/packet/StanzaBuilder.java

6
NOTICE

@ -29,6 +29,7 @@ Chris Deering
Christoph Fiehe
Craig Hesling
Damian Minkov
Dan Caseley
Daniele Ricci
Daniel Henninger
Daniel Hintze
@ -44,6 +45,7 @@ Fernando Ramirez
Florian Kimmann
Florian Schmaus
Francisco Vives
Frank Matheron
Gaston Dombiak
Georg Lukas
Gilles Cornu
@ -64,6 +66,7 @@ Jay Kline
Jeff Williams
Jesus Fuentes
John Haubrich
Jonathan Lennox
Júlio Cesar Bueno Cotta
Lars Noschinski
Luca Stucchi
@ -82,6 +85,7 @@ Pete Matern
Piotr Nosek
Rajat Kumar Gupta
Robin Collier
Simon Abykov
Simon Schuster
Son Goku
Tairs Rzajevs
@ -98,4 +102,4 @@ V Lau
Vyacheslav Blinov
Wolf Posdorfer
Xiaowei YAN
Yash Thakkar
Yash Thakkar

3
smack-bosh/src/main/java/org/jivesoftware/smack/bosh/XMPPBOSHConnection.java

@ -203,7 +203,8 @@ public class XMPPBOSHConnection extends AbstractXMPPConnection {
}
try {
XmlPullParser parser = PacketParserUtils.getParserFor("<stream:stream xmlns='jabber:client'/>");
XmlPullParser parser = PacketParserUtils.getParserFor(
"<stream:stream xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams'/>");
onStreamOpen(parser);
} catch (XmlPullParserException | IOException e) {
throw new AssertionError("Failed to setup stream environment", e);

13
smack-core/src/main/java/org/jivesoftware/smack/packet/StanzaBuilder.java

@ -184,6 +184,19 @@ public abstract class StanzaBuilder<B extends StanzaBuilder<B>> implements Stanz
return getThis();
}
public final B removeExtension(String elementName, String namespace) {
QName key = new QName(namespace, elementName);
extensionElements.remove(key);
return getThis();
}
public final B removeExtension(ExtensionElement extension) {
QName key = extension.getQName();
List<XmlElement> list = extensionElements.getAll(key);
list.remove(extension);
return getThis();
}
public abstract Stanza build();
public abstract B getThis();

Loading…
Cancel
Save