Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-12-23 21:17:58 +01:00
Code Issues Releases Wiki Activity
1542 commits 8 branches 0 tags 34 MiB
Commit graph

1542 commits

This branch
This branch
All branches
Author SHA1 Message Date
Florian Schmaus
2ea5ee3b26 SMACK-425 fix merge error 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13691 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-06-24 07:25:20 +00:00
Florian Schmaus
6ed6f86293 SMACK-405 Removed redundant code in XMPPConnection.shutdown() 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13687 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-06-22 17:00:53 +00:00
Florian Schmaus
c7d468697f SMACK-431 Entity Capabilities are now enabled as default for new connections. Added an extensions documentation html page. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13686 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-06-22 17:00:40 +00:00
Florian Schmaus
4cd53e4419 SMACK-425 Introduced smack.parsing.ParsingExceptionCallback, a callback invoked when a exception is thrown while parsing a stanza. Smack is now able to either rethrow the exception ulitmatly causing a disconnect *or* log/ignore the exception and resume parsing after the faulty stanza. 
Conflicts:
	source/org/jivesoftware/smack/SmackConfiguration.java

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13685 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-06-22 17:00:27 +00:00
rcollier
dac68c64a9 Merge from 3.3 branch 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13663 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-05-18 16:56:52 +00:00
Florian Schmaus
2195d66e4d SMACK-439 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13649 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-05-12 14:51:50 +00:00
Florian Schmaus
37f6bf12da SMACK-438 Avoid NPE when the weak reference is null. Add InvitationsMonitor as strong reference within getInvitationsMonitor and return it within the block so it can't get gc'ed between put() and get(). 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13648 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-05-12 14:51:41 +00:00
rcollier
df022d155a Updated changelog for 3.3 release. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13640 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-05-04 13:03:10 +00:00
rcollier
57051abfea Updated version information for 3.3 release. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13638 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-05-04 12:15:17 +00:00
Florian Schmaus
6b70974269 SMACK-437 Replaced 'String.isEmpty()' with 'String.length() > 0' 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13631 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-05-03 09:48:41 +00:00
rcollier
238ce7aac3 SMACK-415 Added code that was mistakenly removed to handle optional node attribute 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13625 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-04-29 11:40:49 +00:00
rcollier
f0d729ef52 SMACK-415 Added fix for handling the empty tag case. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13624 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-04-27 15:37:21 +00:00
rcollier
3c975426f6 SMACK-433 Removed unnecessary reset of timeout. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13622 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-04-22 01:07:30 +00:00
rcollier
ce0cb7d491 SMACK-433 Removed Thread.sleep usage for tests 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13621 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-04-22 01:03:43 +00:00
rcollier
fe2e9cdb76 SMACK-344 Patch applied that allows the host and service name to be different for SASL authentication 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13620 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-04-20 22:05:28 +00:00
rcollier
13d87e3d40 SMACK-361 Changed default for filename encoding to Base 32 (which should work on all file systems) and added a Base 64 filename and url safe implementation of the StringEncoder. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13619 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-04-20 21:55:27 +00:00
rcollier
a3faa41696 SMACK-403 Pulling this contribution until the related specs reach a draft status 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13612 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-04-16 02:19:38 +00:00
rcollier
9f0f676151 SMACK-403 Pulling this contribution until the related specs reach a draft status 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13611 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-04-16 01:50:41 +00:00
rcollier
3a4b05ac00 SMACK-412 Abstracted the keepalive implementation and set the thread to start and stop on demand. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13610 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-04-16 01:39:17 +00:00
rcollier
b4432d7627 SMACK-352 Changed or removed copyright notices that should not have been attributed to Jive Software. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13604 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-04-07 19:15:32 +00:00
rcollier
ba81a45b8c SMACK-404 Removed unnecessary string construction. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13603 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-04-07 15:41:20 +00:00
rcollier
4155e9ca80 SMACK-391 Reformat some new files to Smack standard 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13602 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-04-07 13:17:26 +00:00
rcollier
b28037bc79 SMACK-331 Changed methods to existing Smack conventions and moved interface to top level. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13601 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-04-02 00:23:55 +00:00
rcollier
9da54ecbce SMACK-225 Converted abstract class to interface, added missing hashcode method, fixed typos and some minor name changes and added licensing text 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13600 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-04-01 13:40:02 +00:00
rcollier
0a1e72bb5f SMACK-413 Removed some commented out code. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13599 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-03-31 14:26:30 +00:00
rcollier
0fdfd6e75e SMACK-361 Some general code cleanup added some missing hashcode methods and added back some removed public API methods (marked as deprecated). 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13598 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-03-31 14:24:50 +00:00
rcollier
58f56ee31b SMACK-413 Put removed public method back in and marked as deprecated. We can remove in major release. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13592 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-03-24 15:02:25 +00:00
rcollier
998245be26 SMACK-412 Fixed merge error. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13591 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-03-23 22:23:19 +00:00
rcollier
d1fdd497d9 SMACK-415 Applied patch to fix improper use of parser. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13590 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-03-23 22:18:38 +00:00
rcollier
b0bdd56b20 SMACK-412 Fixed merge error. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13589 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-03-23 13:27:55 +00:00
rcollier
a14178990b SMACK-412 Added the pingMyServer back in, cleaned up unneeded synchronization and removed minimum ping interval. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13588 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-03-23 11:59:08 +00:00
rcollier
999c86ef4c SMACK-225 Modified DNSUtils to return a default HostAddress when no DNS resolver is available. This restores the previous default behaviour. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13587 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-03-23 11:55:43 +00:00
Florian Schmaus
07a0b8f722 SMACK-413 fixed vCard parsing regarding the PHOTO element. Moved vCard test cases to unit-test where appropriate. Added testcases for vCard PHOTO parsing. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13586 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-03-23 00:30:59 +00:00
Florian Schmaus
374a12b73a Document how an Avatar can be removed from a vCard. Add a convenience method. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13585 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-03-23 00:30:44 +00:00
Florian Schmaus
638d34fd06 SMACK-413 fixed vCard parsing regarding the PHOTO element. Moved vCard test cases to unit-test where appropriate. Added testcases for vCard PHOTO parsing. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13584 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-03-23 00:27:14 +00:00
Florian Schmaus
ca2f8efe60 Document how an Avatar can be removed from a vCard. Add a convenience method. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13583 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-03-23 00:26:42 +00:00
Florian Schmaus
6aa195eb88 SMACK-382 Prevent memory leak in AdHocCommandManager by only creating the Thread if it's actually needed 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13582 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-03-22 18:15:21 +00:00
Florian Schmaus
bd70a95f8c SMACK-384 Don't use a semaphore while waiting for PacketReader to be started. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13581 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-03-22 18:15:13 +00:00
Florian Schmaus
a7d73993b0 SMACK-430 Re-activated code that throws an exception if createOutgoingFileTransfer() was called with a bare JID 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13580 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-03-22 18:15:06 +00:00
Florian Schmaus
3891c738ad Added isFullJID() helper in StringUtils 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13579 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-03-22 18:14:58 +00:00
Florian Schmaus
ebfe3e69ed SMACK-382 Prevent memory leak in AdHocCommandManager by only creating the Thread if it's actually needed 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13578 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-03-22 18:14:15 +00:00
Florian Schmaus
57a5f88ead SMACK-384 Don't use a semaphore while waiting for PacketReader to be started. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13577 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-03-22 18:14:08 +00:00
Florian Schmaus
b091f6161e SMACK-430 Re-activated code that throws an exception if createOutgoingFileTransfer() was called with a bare JID 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13576 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-03-22 18:14:01 +00:00
Florian Schmaus
ff64c57b4d Added isFullJID() helper in StringUtils 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13575 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-03-22 18:13:53 +00:00
rcollier
e3f842da8c SMACK-361 Updated test case to fix create temp directory on Windows 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13574 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-03-19 22:42:43 +00:00
rcollier
aab1dcdabe SMACK-412 Split the ping implementation to a server ping to replace keepalive and a simplified ping manager for manual pings of other entities. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13569 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-03-19 02:37:36 +00:00
Florian Schmaus
a55b54f20b SMACK-417 If both PacketReader and PacketWriter fail at the same time, connectionClosedonError() is called two times 
Refactored notifyConnectionError() and notifyReconnection() from PacketReader to XMPPConnection. Made PacketReader.done and PacketWriter.done volatile. Prevent duplicate connectionClosedonError() calls by making the method synchronzied and protected them with an enter guard: if (packetReader.done && packetWriter.done) return;

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13568 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-03-18 19:58:48 +00:00
Florian Schmaus
6dcf8e0123 SMACK-419 PacketWriter: Only flush if queue is empty 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13567 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-03-18 19:58:14 +00:00
Florian Schmaus
26338a2754 SMACK-417 If both PacketReader and PacketWriter fail at the same time, connectionClosedonError() is called two times 
Refactored notifyConnectionError() and notifyReconnection() from PacketReader to XMPPConnection. Made PacketReader.done and PacketWriter.done volatile. Prevent duplicate connectionClosedonError() calls by making the method synchronzied and protected them with an enter guard: if (packetReader.done && packetWriter.done) return;

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13566 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-03-18 19:57:28 +00:00
Florian Schmaus
cb44042d3c SMACK-419 PacketWriter: Only flush if queue is empty 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13565 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-03-18 19:56:58 +00:00