Florian Schmaus
5333bde2e8
Merge branch '4.2'
2018-02-10 12:14:09 +01:00
Florian Schmaus
278c15d52d
Deprecate some chat2 ChatManager APIs
...
because their functional interfaces clashes. This helps to prepare
Smack for Java 8 where such a construct results in a compile time error.
2018-02-10 12:10:19 +01:00
Florian Schmaus
6f7d6a7f50
Smack 4.2.3
...
-----BEGIN PGP SIGNATURE-----
iQGTBAABCgB9FiEEl3UFnzoh3OFr5PuuIjmn6PWFIFIFAlp7XzVfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDk3
NzUwNTlGM0EyMURDRTE2QkU0RkJBRTIyMzlBN0U4RjU4NTIwNTIACgkQIjmn6PWF
IFKdbQf8CpKmvAUqThaxSKUZKOzlH71BkneT7gdjLvDyvVLXkxZt+arC/Sx9WHXs
OqP6XxxcUKpP9SVItyikEiyq4A4EAlYbtnGcAnJ2Zc04MorEvYtfePgX29WVMKa6
VGZv4PyILAqRMBgQP6+TW++sgqB8JvlVY29e2igfM7mFjOiZdKkEPr2TZ995/XiT
07WFxo72Fe7xXWTVWx5e2hbgC+KPtUFbm0rEBQ3x3seBbRQkn2f3sm8AItj6NKvz
3W9Fzc7n+NY0l+84lX4mSB4Xq851AtOhJPeuSBijgYNM6V8yAXdCAHd0XJSiE89e
/WwRIJAxLy74WzXs0wN3IAieKQhHdw==
=/ZOL
-----END PGP SIGNATURE-----
Merge tag '4.2.3'
Smack 4.2.3
2018-02-10 11:56:52 +01:00
Florian Schmaus
6dfc20ee5e
Rename "Packet (Reader|Writer)" to just Reader or Writer
2018-02-09 10:26:42 +01:00
Florian Schmaus
dfe5c5c09f
Smack 4.2.4-SNAPSHOT
2018-02-07 21:44:59 +01:00
Florian Schmaus
1de9d3dee0
Smack 4.2.3
2018-02-07 21:19:01 +01:00
Florian Schmaus
dfaee56415
Merge pull request #197 from vanitasvitae/fixMucDoc
...
Fix typo in MUC documentation example
2018-02-06 11:10:43 +01:00
4ca2f84d41
Fix typo in example
2018-01-23 16:31:43 +01:00
Florian Schmaus
77c0865326
Merge pull request #196 from cl90/4.2
...
Bugfix in SOCKS5 authentication
2018-01-19 13:21:55 +01:00
lohse
93683389e3
Bugfix in SOCKS5 authentication
...
Read password bytes from the correct field.
Fixes SMACK-796, introduced with 4c64643
2018-01-19 12:53:57 +01:00
dave-stanley
ae46f653fd
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
2018-01-18 08:14:02 +01:00
Florian Schmaus
3c4225d167
Merge branch '4.2'
2017-12-25 14:16:43 +01:00
Florian Schmaus
34373e8710
Enable javadoc 'html' doclint
...
Also make all 'test' tasks depend on the 'javadoc' task.
Fixes SMACK-650.
2017-12-25 14:08:18 +01:00
Florian Schmaus
0cf33f9849
Merge branch '4.2'
2017-12-25 12:10:35 +01:00
Florian Schmaus
89c97bb46c
Enable javadoc 'syntax' doclint
...
Addresses SMACK-650 but does not yet fix it completely.
2017-12-25 12:09:46 +01:00
Florian Schmaus
0eeab74990
Merge branch '4.2'
2017-12-25 11:40:45 +01:00
Florian Schmaus
e5e5fca7c1
Merge pull request #191 from vanitasvitae/fixJavadoc
...
Fix javadoc issues in some packages
2017-12-24 14:46:02 +01:00
Florian Schmaus
2d102e2dd5
Merge pull request #190 from vanitasvitae/retainAPI
...
Retain old API
2017-12-24 14:44:13 +01:00
52398b535f
Fix javadoc issues in some packages
2017-12-23 20:21:19 +01:00
e1acf0cfd2
Retain smack-jingle-old API
2017-12-19 15:06:55 +01:00
2288825b1c
Retain smack-core API
2017-12-19 15:06:40 +01:00
2f2c2f8663
Fix minor codestyle issues
2017-12-17 11:19:41 +01:00
Florian Schmaus
431e5b3c67
Merge branch '4.2' into master-paul-merged
2017-12-17 11:16:02 +01:00
cb18056613
Fix minor codestyle issues
2017-12-17 11:03:46 +01:00
Florian Schmaus
200f90ffdc
Add IpAddressUtilTest
2017-12-16 12:40:17 +01:00
Florian Schmaus
517fc6e0f2
Add assert to IpAddressUtil.isIPv4LiteralAddress(String)
2017-12-16 12:37:11 +01:00
Florian Schmaus
5147f6e915
Fix IPAddressUtil.isIPv4LiteralAddress(String)
...
Fixes SMACK-791
2017-12-16 12:36:02 +01:00
Florian Schmaus
63dd9953fc
Improve HTTP File Upload SlotProvider
2017-12-10 15:29:57 +01:00
Florian Schmaus
3a7c20ce54
Add more HTTP File Upload SlotProvider tests
2017-12-10 14:23:11 +01:00
Florian Schmaus
0a0066c806
Fix XEP-0363 HTTP File Upload elements
...
Smack still expected the URLs as element text and not as value of an
'url' attribute.
Fixes SMACK-790.
2017-12-10 14:22:57 +01:00
Florian Schmaus
36a278eeca
Add javadoc to HTTP File Upload API
2017-12-09 10:35:32 +01:00
Florian Schmaus
e1615ee7d3
Eliminate stray 'g' in experimental.providers
2017-12-07 17:55:18 +01:00
Florian Schmaus
9863b9c458
Use ResolverResult.getResolutionUnsuccessfulException() in MiniDnsResolver
2017-12-05 20:53:05 +01:00
Florian Schmaus
a25971d02b
Add AffiliationsExtensionTest
2017-12-05 20:50:34 +01:00
Florian Schmaus
ca1852f6e0
Fix AffiliationsExtension.toXml()
...
Fixes SMACK-789.
2017-12-05 20:50:34 +01:00
Florian Schmaus
47940ba5ad
Fix NPE in DNSResolver.lookupSRVRecords0
...
in case hostAddresses was null, the isEmpty() check before the log()
invocation would throw an NPE. Thanks to Ingo Bauersachs for reporting
this.
Fixes SMACK-788.
2017-12-05 20:50:34 +01:00
Florian Schmaus
76a6b9f2a1
Smack 4.2.2
...
-----BEGIN PGP SIGNATURE-----
iQGTBAABCgB9FiEEl3UFnzoh3OFr5PuuIjmn6PWFIFIFAloZnf5fFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDk3
NzUwNTlGM0EyMURDRTE2QkU0RkJBRTIyMzlBN0U4RjU4NTIwNTIACgkQIjmn6PWF
IFLcIQgAsTLRI3sWIZDPRuI5YaU/y6beqqzMp5cQgk/9+9DHGBoziLEU1spkvBs2
Yvlwu3NtHSJsI+ibzYLEFRnzEwuW07vXw7R5J+kRSZrsE40z1HCQRwUIXDkPgghe
MuL6vT6OV+kLqKb33YLSBuT2fj2pzVE6mRmMsnFekay/weEqOGUZaY9Hd5lJ31/9
33fQC0FQfKULQ5t7PbdfX4dDDNWn0n6v+KjvjaskHI0oA+vqPWxPkj8gNXWW8b72
tVV4h5uXQ0ziK3oED79+GH+DSiET9N2PmsZ7woXiFy5H8KbcQDVe5Pazf+Iq2VQ+
Vi6Vxikr6Ak+v2Xkt+e3x9E6mZDI1w==
=CVqq
-----END PGP SIGNATURE-----
Merge tag '4.2.2'
Smack 4.2.2
2017-11-25 18:45:32 +01:00
Florian Schmaus
be4aacc71d
Smack 4.2.3-SNAPSHOT
2017-11-25 17:59:07 +01:00
Florian Schmaus
0fcacf3d9a
Smack 4.2.2
2017-11-25 17:44:45 +01:00
Florian Schmaus
2edbc64957
Refactor reconnection callbacks into an extra class
...
Fixes SMACK-775
2017-11-25 16:30:18 +01:00
Florian Schmaus
d804d4ed6d
Do not abort if we could not get a KeyManagerFactory
...
using the default algorithm. Instead continue with 'null' as value of
the KeyManager[] array (kms). This makes the SSLContext.init() methods
to search the default security providers for implementations, which is
also OK.
This change is needed because it appears that on Android
KeyManagerFactory.getDefaultAlgorithm returns 'SunX509', which
subsequently results in
W/AbstractXMPPConnection: Connection XMPPTCPConnection[not-authenticated] (0) closed with error
java.security.NoSuchAlgorithmException: KeyManagerFactory SunX509 implementation not found
at org.apache.harmony.security.fortress.Engine.notFound(Engine.java:190)
at org.apache.harmony.security.fortress.Engine.getInstance(Engine.java:139)
at javax.net.ssl.KeyManagerFactory.getInstance(KeyManagerFactory.java:77)
at org.jivesoftware.smack.tcp.XMPPTCPConnection.proceedTLSReceived(XMPPTCPConnection.java:747)
at org.jivesoftware.smack.tcp.XMPPTCPConnection.access$1200(XMPPTCPConnection.java:149)
at org.jivesoftware.smack.tcp.XMPPTCPConnection$PacketReader.parsePackets(XMPPTCPConnection.java:1053)
at org.jivesoftware.smack.tcp.XMPPTCPConnection$PacketReader.access$300(XMPPTCPConnection.java:980)
at org.jivesoftware.smack.tcp.XMPPTCPConnection$PacketReader$1.run(XMPPTCPConnection.java:996)
at java.lang.Thread.run(Thread.java:818)
Note that this is possibly because the Secuurity Provider was
not (yet) intialized.
2017-11-23 08:21:55 +01:00
Florian Schmaus
573358b459
Limit the scope of local variables in proceedTLSReceived()
2017-11-23 08:15:52 +01:00
Florian Schmaus
32f681c6e5
Initialize keytsoreType with KeyStore.getDefaultType()
2017-11-22 22:34:56 +01:00
Florian Schmaus
81002c4fbd
Merge branch '4.2'
2017-11-22 08:37:47 +01:00
Florian Schmaus
853324a998
Merge pull request #185 from mityada/sm-resumption-race-condition
...
Prevent race condition after stream resumption
2017-11-22 08:29:36 +01:00
Florian Schmaus
af0c1832fd
Update gettingstarted.md
2017-11-21 22:57:10 +01:00
Florian Schmaus
813a5ba63f
Merge pull request #184 from mityada/stream-management-exception
...
Drop stream management state on StreamManagementException
2017-11-21 21:15:41 +01:00
Florian Schmaus
7d1356bf46
Merge pull request #186 from vanitasvitae/fixCheckstyleRule
...
Fix comment checkstyle rule description
2017-11-21 21:15:28 +01:00
Florian Schmaus
5ff4387f68
Fix Presence.getPriority() to not return Integer.MIN_VALUE
...
Fixes SMACK-787.
2017-11-21 21:05:10 +01:00
Florian Schmaus
4775f350ae
Add javadoc to Presence.priority
2017-11-21 21:04:13 +01:00
