Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-16 20:22:05 +01:00
Code Issues Releases Wiki Activity
1634 commits 8 branches 0 tags 34 MiB
Commit graph

39 commits

Author SHA1 Message Date
Florian Schmaus
4bc7ce052d Remove RCS header attributes 2014-02-10 12:33:41 +01:00
Florian Schmaus
f8274dda53 Merge branch smack_3_3_2 and trunk 
as the state of the both branches of Smack's SVN repository
http://fisheye.igniterealtime.org/browse/smack on 2013-12-30.

Conflicts:
	documentation/extensions/caps.html
	source/org/jivesoftware/smack/PacketReader.java
	source/org/jivesoftware/smack/SmackConfiguration.java
	source/org/jivesoftware/smack/parsing/ParsingExceptionCallback.java
	source/org/jivesoftware/smackx/ServiceDiscoveryManager.java
 2013-12-30 01:29:55 +01:00
Florian Schmaus
717d39c8fc Fix caps support (SMACK-361, SMACK-459). 
SMACK-459 splitted the SDM identities over two member variables which
are joined by getIdentities(), therefore this method must be used to
calculated the hash for entity caps.

Also recalculate the hash if an identity is added/remvoed/changed.

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13801 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-11-04 20:58:36 +00:00
Florian Schmaus
385cfac9fa SMACK-459 Make it user proof by returning an unmodifiable set again 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13797 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-10-31 20:28:40 +00:00
Florian Schmaus
6fa2cbee68 SMACK-459 actually add the defaultIdentity to the result of getIdentities() 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13796 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-10-31 20:24:02 +00:00
Florian Schmaus
44c3214539 SMACK-460 ServiceDiscoveryManager constructor usage in 
connectionCreated()

ServiceDiscoveryManager should not use the constructor in
connectionCreated(), it may cause duplicate SDMs for the same connection
and prevents the interaction with SDM before the connection is
established. Instead getInstanceFor() is now used.

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_2@13792 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-10-26 23:53:04 +00:00
Florian Schmaus
addf9ea6cd SMACK-459 Add option to configure the default identity in ServiceDiscoveryManager 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13790 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-10-26 23:50:59 +00:00
Florian Schmaus
b16f34f61e SMACK-458 Managers should be kept on disconnects 
Smack's Managers should not remove itself when the connection is closed
or should re-add themselves if the connection get reconnected.

This should also fix some NPE's.

We are currently going with two different designs of Manager: 1. The one
with WeakReferences/WeakHashMaps (SDM, EntityCapsManager) and 2. the one
where the managers remove their listeners on connectionClosed() *and*
connectionClosedOnError(), and later add their listeners on
reconnectionSuccessful(). The first design has the Connection instance
only weak referenced. The other design does reference Connection
strongly (e.g. the 'managers' map in IBBManager/S5BManager), but removes
this references when connectionClosed(onError)() is called.

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_2@13788 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-10-26 11:17:16 +00:00
Florian Schmaus
c4014b8ba9 SMACK-441 ServiceDiscoveryManager identities should be non-static and kept in a Set to allow multiple identities as per XEP-0030 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13783 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-10-22 14:43:23 +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
Florian Schmaus
21be8c55ee SMACK-361 Added support for Entity Capabilities. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13560 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-03-18 08:50:48 +00:00
Florian Schmaus
1a170c1561 ServiceDiscoveryManager: Use 'Set' as data structure for features to prevent reporting duplicate features 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13465 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-02-11 17:22:42 +00:00
Florian Schmaus
7723b9fcfd ServiceDiscoveryManager: Anounce 'disco#info' and 'disco#items' on service discovery queries in accordance with XEP-0030 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13464 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-02-11 17:22:31 +00:00
rcollier
fdd60122d3 SMACK-348 Updated broken links. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12580 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-08-18 03:44:41 +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
Daniel Henninger
3a1a6b7830 Applied patch for full XEP-128 compliance from Guus. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@9920 b35dd754-fafc-0310-a699-88a17e54d16e
 2008-02-15 16:32:46 +00:00
Matt Tucker
98bf0d8cfb Copyright update. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@7071 b35dd754-fafc-0310-a699-88a17e54d16e
 2007-02-12 00:59:05 +00:00
Alex Wenckus
0537629ee9 Spellcheck. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@6106 b35dd754-fafc-0310-a699-88a17e54d16e
 2006-11-14 21:58:03 +00:00
Gaston Dombiak
87e6c2aba5 Added support for returning list of identities of a hosted node. SMACK-178 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@5720 b35dd754-fafc-0310-a699-88a17e54d16e
 2006-10-16 17:56:48 +00:00
Gaston Dombiak
216971659a Renamed ConnectionEstablishedListener to ConnectionCreationListener. SMACK-173 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@5388 b35dd754-fafc-0310-a699-88a17e54d16e
 2006-09-15 23:05:01 +00:00
Matt Tucker
6be93f4a4e Code cleanup and refactoring. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@5383 b35dd754-fafc-0310-a699-88a17e54d16e
 2006-09-15 21:51:08 +00:00
Gaston Dombiak
3af86fd462 Added reconnection support. SMACK-172 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@5367 b35dd754-fafc-0310-a699-88a17e54d16e
 2006-09-14 19:16:40 +00:00
Matt Tucker
47abf627b7 Added privacy list support and improved error handling from Francisco (SMACK-121, SMACK-31). 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@4603 b35dd754-fafc-0310-a699-88a17e54d16e
 2006-07-19 19:24:00 +00:00
Gaston Dombiak
f57ff10ad9 1. Clean up code 
2. Refactoring work
3. Optimization work. SMACK-153
4. Fixed roster test cases. SMACK-154
4. Fixed vCard issue. SMACK-152

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@4538 b35dd754-fafc-0310-a699-88a17e54d16e
 2006-07-18 05:14:33 +00:00
Gaston Dombiak
c49356052f Added support to return disco#info features of hosted nodes. SMACK-150 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@4341 b35dd754-fafc-0310-a699-88a17e54d16e
 2006-07-10 16:56:14 +00:00
Alex Wenckus
3b4b5c36b6 Disco was not responding correctly when the provided node was not found. SMACK-126 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@3502 b35dd754-fafc-0310-a699-88a17e54d16e
 2006-02-28 18:52:17 +00:00
Gaston Dombiak
7668ad5ce5 Methods comments enhanced. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2480 b35dd754-fafc-0310-a699-88a17e54d16e
 2005-04-04 19:50:09 +00:00
Matt Tucker
e382efa52a Updated to Apache 2.0 license. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2407 b35dd754-fafc-0310-a699-88a17e54d16e
 2004-11-02 23:37:00 +00:00
Gaston Dombiak
207c0aea02 Answer an item-not-found error when Smack receives a disco#info and node is not null. SMACK-8 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2402 b35dd754-fafc-0310-a699-88a17e54d16e
 2004-10-31 03:35:20 +00:00
Gaston Dombiak
1a093754e1 Fixes NPE when sending null as the node while trying to get the NodeInformationProvider for a node. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2364 b35dd754-fafc-0310-a699-88a17e54d16e
 2004-08-10 13:03:15 +00:00
Gaston Dombiak
3c80abdf45 Moved identityName and identityType from SmackConfiguration to ServiceDiscoveryManager. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2359 b35dd754-fafc-0310-a699-88a17e54d16e
 2004-08-09 22:09:20 +00:00
Matt Tucker
5eb9146cb8 Fixed Javadoc issues. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2356 b35dd754-fafc-0310-a699-88a17e54d16e
 2004-08-09 21:15:42 +00:00
Gaston Dombiak
ecadf0b4a8 Allows to discover whether a server supports publishing of items or not. SMACK-150 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2350 b35dd754-fafc-0310-a699-88a17e54d16e
 2004-08-05 16:57:28 +00:00
Gaston Dombiak
1ce8a33af4 Answers the client identity for a disco info request. SMACK-149 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2348 b35dd754-fafc-0310-a699-88a17e54d16e
 2004-08-04 19:53:39 +00:00
Gaston Dombiak
d53f0e9492 Cancel opened collectors. SMACK-145 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2344 b35dd754-fafc-0310-a699-88a17e54d16e
 2004-07-16 20:46:16 +00:00
Gaston Dombiak
1da02cbfd8 Allows to retrieve items for entity nodes. SMACK-134 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2307 b35dd754-fafc-0310-a699-88a17e54d16e
 2004-05-09 19:18:02 +00:00
Gaston Dombiak
13f15c5e4b Removes hardcoded packet reply timeout value 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2303 b35dd754-fafc-0310-a699-88a17e54d16e
 2004-05-03 00:43:51 +00:00
Gaston Dombiak
7eba4a484b Adds static init - Makes the disco feature available by default on every connection 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2182 b35dd754-fafc-0310-a699-88a17e54d16e
 2003-12-19 17:59:55 +00:00
Gaston Dombiak
420ce10ed9 Initial check-in 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2141 b35dd754-fafc-0310-a699-88a17e54d16e
 2003-10-13 23:05:06 +00:00