vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-11-22 03:52:06 +01:00
Code Issues Releases Wiki Activity

Merge branch '4.4'

Browse source
This commit is contained in:
Florian Schmaus 2021-10-25 17:00:28 +02:00
commit fa88f78232
3 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
NOTICE
View file

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

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

@ -203,7 +203,8 @@ public class XMPPBOSHConnection extends AbstractXMPPConnection {
} }
try { 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); onStreamOpen(parser);
} catch (XmlPullParserException | IOException e) { } catch (XmlPullParserException | IOException e) {
throw new AssertionError("Failed to setup stream environment", e); throw new AssertionError("Failed to setup stream environment", e);

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

@ -184,6 +184,19 @@ public abstract class StanzaBuilder<B extends StanzaBuilder<B>> implements Stanz
return getThis(); 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 Stanza build();
public abstract B getThis(); public abstract B getThis();