Code commits
Smack (4.4)
-
Florian Schmaus <flo@geekplace.eu> ab92bc4b409ed3a42c5e179803cbf5a45bade0cd
Merge pull request #501 from Flowdalic/fix-redundant-namespaces
Fix redundant namespaces -
Florian Schmaus <flo@geekplace.eu> 0fa6d885750f2c96f409b22d8c7c0e052da8fb7a
Merge pull request #500 from jitsi/bugfix/4.4/error-stanzagetter
Add getter for the stanza associated with the exception -
Florian Schmaus <flo@geekplace.eu> a0f97707d84465cf30834cbde35698cd7b0d28a9
Merge pull request #499 from jitsi/feature/4.4/osgi
Make Smack jars OSGi bundles -
Florian Schmaus <flo@geekplace.eu> 7199003f98a924f11a3cea550cbde852f215c764
Merge pull request #498 from jitsi/bugfix/4.4/bosh-connection
Fix BOSH connection establishment -
Florian Schmaus <flo@geekplace.eu> 9fb7d6d97c97d15ae7425166997db164932ca23e
Merge pull request #497 from jitsi/bugfix/4.4/sasl-anonymous
Prevent password enforcement for SASL anonymous -
Florian Schmaus <flo@geekplace.eu> ad6e285346453060034ac8fdb1ca9a77f444c929
Merge pull request #496 from damencho/fix-destroy-4.4
fix: Fixes processing destroy unavailable presence. -
Florian Schmaus <flo@geekplace.eu> dac8b728b48c7f530914e2c805be9f8204f0306c
Merge pull request #492 from Flowdalic/start-local-socks5-proxy
Start local SOCKS5 proxy -
Florian Schmaus <flo@geekplace.eu> 2ff53abef3b17645f000e642d74c4e28b33e8f83
Merge pull request #494 from Flowdalic/mux-race-condition
[muc] Check for self-presence first -
Florian Schmaus <flo@geekplace.eu> d25bd811dc495c1290aafc8c01a5390f97920d47
Merge pull request #491 from Flowdalic/assert-not-end-document
[core] Assert that 'event' is not END_DOCUMENT in forwardToEndTagOfDepth() -
Florian Schmaus <flo@geekplace.eu> 6f67553fcf4d8340f15e47f8a6bf711efcf98971
[jingle] Add unit test to check that there are no redundant namespaces
Related to SMACK-917. -
Florian Schmaus <flo@geekplace.eu> 453ca6aeb06d97ffaa9e9937e17877ccc83958df
[jingle] Make Jingle.Builder extend IqBuilder
This makes Jingle.Builder to follow the new IqBuilder pattern,
allowing to construct Jingle IQs with a given stanza ID (mostly
useful for unit tests).- smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleUtil.java (version 453ca6aeb06d97ffaa9e9937e17877ccc83958df) (diffs)
- smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/Jingle.java (version 453ca6aeb06d97ffaa9e9937e17877ccc83958df) (diffs)
- smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleProvider.java (version 453ca6aeb06d97ffaa9e9937e17877ccc83958df) (diffs)
- smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/JingleS5BTransportManager.java (version 453ca6aeb06d97ffaa9e9937e17877ccc83958df) (diffs)
- smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleTest.java (version 453ca6aeb06d97ffaa9e9937e17877ccc83958df) (diffs)
-
Florian Schmaus <flo@geekplace.eu> a3840659aa626d921ab05beabd627a36a283e3d8
[jingle] Mimic Manager.connection() in JingleTransportManager
Eventually JingleTransportManager should be a subclass of Manager (or
be replaced by Manager), as JingleTransportManager holds a strong
reference to the XMPPConnection. This could cause memory leaks. But
for now, we mimic the Manager API in JingleTransportManger to make a
future transition to Manager easier. -
Florian Schmaus <flo@geekplace.eu> b243a40e26ebb1e0f33c80c91372dc1124a3fa0f
[core] Pass down the XML environment in IQChildElementXmlStringBuilder
This allows to avoid redundant XML namespaces within IQs, like for
example here:
<iq xmlns='jabber:client' id='EKP8I-1' type='set'>
<jingle xmlns='urn:xmpp:jingle:1' action='content-accept' sid='MySession'>
<content xmlns='urn:xmpp:jingle:1' creator='initiator' name='Hello world'>
</content>
</jingle>
</iq>
Fixes SMACK-917
Reported-by: Jonathan Lennox- smack-core/src/main/java/org/jivesoftware/smack/packet/IQ.java (version b243a40e26ebb1e0f33c80c91372dc1124a3fa0f) (diffs)
- smack-core/src/main/java/org/jivesoftware/smack/util/XmlStringBuilder.java (version b243a40e26ebb1e0f33c80c91372dc1124a3fa0f) (diffs)
- smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtension.java (version b243a40e26ebb1e0f33c80c91372dc1124a3fa0f) (diffs)
- smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomInvitation.java (version b243a40e26ebb1e0f33c80c91372dc1124a3fa0f) (diffs)
- smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomTransfer.java (version b243a40e26ebb1e0f33c80c91372dc1124a3fa0f) (diffs)
-
Florian Schmaus <flo@geekplace.eu> 585bcb4dc8d6a2164945ff3dd9b55cad9472f872
[jingle] Add empty element optimization for <content/>
-
Ingo Bauersachs <ingo@jitsi.org> 27ff37fa98d82203b9bf2a9e7404b5967990bf9d
Add getter for the stanza associated with the exception
Fixes SMACK-916 -
Ingo Bauersachs <ingo@jitsi.org> b675aac81b6d4a78b744dbd744baab938d782fdc
Make Smack jars OSGi bundles
Fixes SMACK-343 by using bnd instead of the deprecated Gradle
plugin that was previously used and removed in commit
d06f533bb975f41a5e86c990e1bb830b7e7dc923.- build.gradle (version b675aac81b6d4a78b744dbd744baab938d782fdc) (diffs)
- smack-core/build.gradle (version b675aac81b6d4a78b744dbd744baab938d782fdc) (diffs)
- smack-xmlparser-stax/build.gradle (version b675aac81b6d4a78b744dbd744baab938d782fdc) (diffs)
- smack-xmlparser-xpp3/build.gradle (version b675aac81b6d4a78b744dbd744baab938d782fdc) (diffs)
- smack-xmlparser/build.gradle (version b675aac81b6d4a78b744dbd744baab938d782fdc) (diffs)
-
Ingo Bauersachs <ingo@jitsi.org> 8074ddd60a0abe77ea257af4a113e558e69a8c8f
Fix BOSH connection establishment
AbstractXMPPConnection waits for the flag lastFeaturesReceived since
57961a8cc1f2df6ecc1afa8c4f8460794d8d2dce, but it is never set from
BOSH connections. Use parseFeaturesAndNotify instead of
parseFeatures to set the signal.
Similarly the XmlEnvironment is not set from bosh, but required in
ParserUtils.getXmlLang. -
Ingo Bauersachs <ingo@jitsi.org> 9b339efbc1cff33326f0284c23a3860074ae9457
Prevent password enforcement for SASL anonymous
requirePassword from 92f4aadfdc45c144763c2e2a1921c2fa9a6db90b
already excludes SASL external, but missed SASL anonymous. -
Дамян Минков <damencho@jitsi.org> 820adf88653e6fe3d6b1e59489379966dfbf5dee
[muc] Also process destory message if it contains <status/>
Fixes SMACK-915 -
Florian Schmaus <flo@geekplace.eu> 105c74b22bce25ee98a8f68ef65f5c8885abddfc
[muc] Call userHasLeft() *after* the leave presence was sent
Calling userHasLeft before sending the leave presence may result in
invalid state as the MUC presence lister may modify the MUCs local
state, e.g., occupantsMap, conurrently with the leave operation.
If we reset it after the leave presence was send and acknowledged,
then this can not happen as the server will not longer send any MUC
related presences to us.
Also fixes SMACK-914. In theory 52a49769f9a8 ("[muc] Check for
self-presence first in presence listener") alone would fix SMACK-914,
but this also fixes it indepentendly of 52a49769f9a8. Both commits are
sensible, so both are applied. -
Florian Schmaus <flo@geekplace.eu> 52a49769f9a825a8c0252efcad0d96635fb257a6
[muc] Check for self-presence first in presence listener
Fixes SMACK-914 -
Florian Schmaus <flo@geekplace.eu> b57cf8375f38d609ec6c6d9597585d1b49d3f806 m
[socks5] Remove stale null check
The method getLocalStreamHost() does no longer return 'null', hence
the null check is unnecessary. -
Florian Schmaus <flo@geekplace.eu> 09710b3203ef7110d1566f1cc8d58b70678a8ae0 m
[socks5] Fix javadoc of getLocalStreamHost()
The method does no longer return null.
Reported-by: Simon Abykov <simon.abykov@gmail.com> -
Florian Schmaus <flo@geekplace.eu> 55299fb7e7c4e3636beba180868cab62f5e06cfe m
[core] Assert that 'event' is not END_DOCUMENT in forwardToEndTagOfDepth()
-
Florian Schmaus <flo@geekplace.eu> 8ae5ef1f513d4b3b24c291991215d04f96016453 m
[socks5] Ensure that the local SOCKS5 proxy is running (if enabled)
In 9352225f444b ("Rework SOCKS5 unit tests so that they can be run in
parallel") the call to getSocks5Proxy() in
Socks5BytestreamManager.getLocalStreamHost() was removed. Since
getSocks5Proxy() does also start the local proxy, if it is not already
running, this caused Smack to no longer automatically start the local
proxy.
This commit re-adds the call to getSocks5Proxy() and fixes SMACK-912.