vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-11-23 04:22:05 +01:00
Code Issues Releases Wiki Activity
1481 commits 61 branches 35 tags 39 MiB
Commit graph

586 commits

Author SHA1 Message Date
Florian Schmaus
5dea9d3ee1 SMACK-379 Removed mandatory session establishment, since it was dropped from the newer XMPP-IM RFC (a.k.a. RFC 6121) 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13521 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-02-26 08:44:32 +00:00
Florian Schmaus
da1987a98b SMACK-376 Allow supplying a custom SSLContext for encrypted connections. 
The provided TrustManager / SSLContext implementation is very flexible,
but it does not allow to query the user about accepting possibly
invalid SSL certificates. By supplying a custom SSLContext with a
TrustManager implementing such a query mechanism it is possible to
implement this behaviour.

The patch adds ConnectionConfiguration.customSSLContext with appropriate
getter/setter methods and uses the custom context in XMPPConnection.

Signed-Off-By: Georg Lukas <georg@op-co.de>

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13520 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-02-26 08:44:17 +00:00
Florian Schmaus
b907d606d9 SMACK-352 removed duplicated headers, fixed svn keywords 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13459 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-02-07 19:10:22 +00:00
Florian Schmaus
6bbf425157 SMACK-352 
- fixed wrong header
- replaced old Jive license with Apache 2.0 license
- added license header to files without

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13457 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-02-07 14:19:47 +00:00
rcollier
d1e9d81769 SMACK-341 Updated collectors to use concurrent classes. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13452 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-02-07 03:42:33 +00:00
rcollier
e0e92eca76 SMACK-407 Time zones now parse correctly. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13442 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-02-06 03:38:11 +00:00
rcollier
457959bc88 SMACK-391 New enum to define date formats and profiles. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13429 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-02-04 03:52:08 +00:00
rcollier
1d36ae8db4 SMACK-391 Moved all date parsing into StringUtils and made it much more robust in handling multiple valid and invalid formats. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13428 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-02-04 03:45:37 +00:00
Florian Schmaus
43619de7aa SMACK-377 Avoid an unnecessary DNS request by using directly the, at this point known IP, instead of using the hostname as argument for the new socket. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13420 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-01-31 22:31:31 +00:00
Florian Schmaus
c76ed51541 SMACK-385 Reuse the KeyStore in order to reduce memory usage. Extended ServerTrustManager with a 'stores' (Hash)Map that allows the reuse of an existing KeyStore. Before that, every call of KeyStore.getInstance() created a new instance which consumes about 250KiB. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13419 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-01-31 22:31:04 +00:00
Florian Schmaus
401c37bd28 SMACK-404 Changed StringUtils.decodeBase64(String) behavior so that the method does not try to detect and decompress a gzip-compressed input. Refactored every use of the Base64.(de|en)code* methods to use the StringUtils (de|en)codeBase64 methods instead. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13416 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-01-29 22:49:20 +00:00
Florian Schmaus
e1bb5a6123 SMACK-278: Call socket.close() in XMPPConnection.shutdown() before 
closing the reader and writer streams. This basically prevents the
deadlock reported in SMACK-278.

Additionally, we need to tell the PacketReader and PacketWriter that
the socket got closed and that subsequent caused Exceptions can be
ignored. This is done via the socketClosed boolean in XMPP Connection,
that is queried by PacketReader and PacketWriter in case an Exception
is encountered.

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13390 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-01-06 14:02:44 +00:00
Florian Schmaus
3c2eaba840 KeepAliveTask: Increased the initial heartbeat dealy in order to 
prevent a heartbeat timeout in high latency situations (mobile
environments)"

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13389 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-01-06 14:02:35 +00:00
Florian Schmaus
7770511111 Fixed typo 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13388 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-01-06 14:01:52 +00:00
Florian Schmaus
8c14f0cb55 Added XEP-199 aka. "XMPP Ping" support to smack. Fixes SMACK-388. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13384 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-01-04 11:43:35 +00:00
rcollier
fc3ec2ab8a SMACK-390 Log exception in parsing extensions of Presence. Valid Presence will still be returned with extensions missing. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13326 b35dd754-fafc-0310-a699-88a17e54d16e
 2012-10-30 01:53:44 +00:00
rcollier
e08c8afe44 SMACK-363 Applied code cleanup patches for many generics related issues. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13325 b35dd754-fafc-0310-a699-88a17e54d16e
 2012-10-26 10:47:55 +00:00
rcollier
a92d37a32b SMACK-349 Couple of fixes to test cases based on changes in base64 encoding buffer sizes. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12957 b35dd754-fafc-0310-a699-88a17e54d16e
 2012-01-27 21:30:09 +00:00
rcollier
298841cf54 Moved the EmbeddedExtensionProvider from smackx to smack, since it is not tied to extensions but is a simple utility for aiding in parsing of custom cabinets. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12921 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-12-19 17:26:47 +00:00
rcollier
c96be693dc Moved utility class to the core, since it is not extension related and useful for all code. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12598 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-09-21 23:57:34 +00:00
rcollier
eda09cb3ca SMACK-324 Applied recommended patch to remove improper stanza construction. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12579 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-08-18 03:28:05 +00:00
rcollier
50bf29b122 Updates for Release of 3.2.1 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12557 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-07-04 19:51:43 +00:00
rcollier
402b430291 SMACK-230 Added synchronization since disconnect can be called from multiple threads. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12540 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-06-23 19:55:10 +00:00
rcollier
da5434505b SMACK-129 - Added a property in smack-config file for the default packet collector size and set it much lower than the previous default. Also made the max size for packet collectors configurable from the constructor. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12509 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-06-18 18:18:03 +00:00
rcollier
84c43c4fdd Updated all version info for 3.2 release. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12329 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-05-04 23:41:24 +00:00
Holger Bergunde
f90b43a87c SMACK-325 patched the diff to ReconnectionManager manually. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12219 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-03-31 06:35:59 +00:00
rcollier
0ec7e23666 Updated some javadoc that caused confusion as to the login() behaviour. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12194 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-03-28 13:13:41 +00:00
rcollier
2150d07435 Merged the 3.2 Beta branch into trunk. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12107 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-03-14 01:53:42 +00:00
Holger Bergunde
6494edb15a SMACK-317 setOrder() from PrivacyItem is now public. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12100 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-03-11 11:16:05 +00:00
Holger Bergunde
4ada4978d8 SMACK-312 Fire roster listener also when the group name changed 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12087 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-03-10 11:30:53 +00:00
Holger Bergunde
5a544a50e3 SMACK-332 Debugger shows the "right" version: Currently: 3.2.0 Beta 2 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12086 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-03-10 11:24:51 +00:00
Henning Staib
e3962d15ae only fire roster listener if entry changed (SMACK-312) 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11827 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-08-15 16:37:51 +00:00
Henning Staib
a5693609b2 add the ability to register for roster events before logging in (SMACK-156) 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11826 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-08-15 16:32:09 +00:00
Henning Staib
7a3818783b add support for localized Message subjects (fixes SMACK-310) 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11825 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-08-15 15:45:57 +00:00
Henning Staib
cb5310c984 improve Message parser robustness and I18N for Message bodies (fixes SMACK-207 and SMACK-307) 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11824 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-08-15 15:13:05 +00:00
Henning Staib
7e01c66374 improved Delay Information Parser (fixes SMACK-243) 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11823 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-08-15 13:20:48 +00:00
Henning Staib
8b54f34153 merged branch improve_bytestreams in trunk 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11821 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-08-15 11:57:11 +00:00
Günther Niess
31cd0ab088 SMACK-305: fixed roster reload 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11670 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-03-24 20:31:06 +00:00
Günther Niess
446a601b73 SMACK-304: Extend the IQ API to create IQ responses 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11669 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-03-24 19:44:02 +00:00
Günther Niess
5f50f087ac SMACK-295: Fire reconnectionSuccessful event when session is established 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11652 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-02-24 00:45:40 +00:00
Günther Niess
5cb76891ba small fix (SMACK-294) 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11644 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-02-18 15:37:16 +00:00
Günther Niess
379b119d12 SMACK-294: Improve handling for empty groups 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11643 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-02-18 14:33:45 +00:00
Günther Niess
a441d856f8 SMACK-293: Support optional roster subscription attribute 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11642 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-02-18 14:24:52 +00:00
Günther Niess
0d9c25d475 SMACK-291: RosterGroup modifications should depend on roster push 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11634 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-02-16 09:10:51 +00:00
Günther Niess
691c433b3a SMACK-290: Fix deadlock while initializing roster 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11620 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-02-11 14:26:28 +00:00
Günther Niess
539f652443 SMACK-282: Support SASL-related error conditions 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11616 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-02-09 12:40:11 +00:00
Günther Niess
e3efee2e8f SMACK-280: The SASL mechanisms work transparent with packet listeners 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11615 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-02-09 12:24:24 +00:00
Günther Niess
ad65a76e77 SMACK-281: Move more packet parsing code to PacketParserUtils 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11614 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-02-09 12:11:39 +00:00
Günther Niess
127319a821 SMACK-279: The XMPPConnection extends the new abstract Connection class 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11613 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-02-09 11:55:56 +00:00
guus
8101b21c71 Added a bit of javadoc, explaining when the event is (not) fired. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11519 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-01-12 11:28:01 +00:00