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
1ea6159ce4
SMACK-461 Remove incorrect deprecated marker for DiscoverInfo.Identity.setType()
...
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_2@13791 b35dd754-fafc-0310-a699-88a17e54d16e
2013-10-26 23:52:57 +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
62bc862015
SMACK-443 remove duplicate notifyReconnection()
...
notifyReconnection() was called in initConnection() and in connect()
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_2@13789 b35dd754-fafc-0310-a699-88a17e54d16e
2013-10-26 11:26:19 +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
032fc8626e
SMACK-442 Manager should also handle connectionClosedOnError()
...
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_2@13784 b35dd754-fafc-0310-a699-88a17e54d16e
2013-10-22 14:43:48 +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
Florian Schmaus
5f793d4f44
SMACK-431 Reworded Entity Caps documentation, added missing frame link
...
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13782 b35dd754-fafc-0310-a699-88a17e54d16e
2013-10-22 14:43:13 +00:00
Florian Schmaus
aa5906f1f1
SMACK-457 Remove unnecessary printStackTrace() in XMPPConnection
...
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_2@13773 b35dd754-fafc-0310-a699-88a17e54d16e
2013-10-17 17:38:19 +00:00
Florian Schmaus
bd709dc323
SMACK-452 Correctly parse stream error packets
...
Modified PacketParserUtils.parseStreamError() to take into account that
there may be an optional text element and an optional application
specific element.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_2@13767 b35dd754-fafc-0310-a699-88a17e54d16e
2013-10-09 17:02:34 +00:00
Florian Schmaus
b253203cfb
SMACK-444 Allow 'null' for options in ServerTrustManager
...
Allow 'null' for TruststorePath and TruststorePassword in ServerTrustManager
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_2@13766 b35dd754-fafc-0310-a699-88a17e54d16e
2013-10-09 12:31:17 +00:00
Florian Schmaus
9a7bf4a4c3
SMACK-456 Added the causing exception
...
XMPPConnection.connectUsingConfiguraiton() does now add the causing
exception to the throwed exception.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_2@13765 b35dd754-fafc-0310-a699-88a17e54d16e
2013-10-09 11:54:03 +00:00
Florian Schmaus
7543c896c2
Created 3.3.2 branch
...
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_2@13764 b35dd754-fafc-0310-a699-88a17e54d16e
2013-10-09 10:47:36 +00:00
rcollier
e87daff68f
Versioning updates for new release.
...
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_1@13761 b35dd754-fafc-0310-a699-88a17e54d16e
2013-10-07 02:42:12 +00:00
rcollier
3146023dd4
SMACK-455 Fixed improper advance of parser when parsing multiple items in a pubsub message.
...
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_1@13760 b35dd754-fafc-0310-a699-88a17e54d16e
2013-10-07 01:38:09 +00:00
rcollier
25012a6744
SMACK-425 Few changes based on review http://fisheye.igniterealtime.org/cru/SMACK-4
...
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_1@13759 b35dd754-fafc-0310-a699-88a17e54d16e
2013-10-05 23:14:24 +00:00
rcollier
6a4827c846
SMACK-451 Moved providers declaration for ping manager as it was in the middle of the ad-hoc entries
...
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_1@13744 b35dd754-fafc-0310-a699-88a17e54d16e
2013-09-16 22:50:41 +00:00
Florian Schmaus
4d1eaf522a
SMACK-450 Make VCard.doLoad() return if the received packet was not an error and also not an VCard. Avoid calling VCard.load() with 'null' as argument.
...
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_1@13713 b35dd754-fafc-0310-a699-88a17e54d16e
2013-07-12 22:54:03 +00:00
rcollier
d237e06dab
SMACK-441 Create packet collector only when necessary
...
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_1@13703 b35dd754-fafc-0310-a699-88a17e54d16e
2013-06-30 20:00:50 +00:00
Florian Schmaus
c462810080
SMACK-448 Java7ZlibInputOutputStream: Use correct Deflater compression level
...
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13694 b35dd754-fafc-0310-a699-88a17e54d16e
2013-06-25 06:40:30 +00:00
Florian Schmaus
9f2446c78e
SMACK-448 Java7ZlibInputOutputStream: Use correct Deflater compression level
...
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_1@13693 b35dd754-fafc-0310-a699-88a17e54d16e
2013-06-24 22:42:37 +00:00
Florian Schmaus
c2d057f4b2
SMACK-431 Reworded Entity Caps documentation, added missing frame link
...
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_1@13692 b35dd754-fafc-0310-a699-88a17e54d16e
2013-06-24 21:27:43 +00:00
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
0f247cf30e
SMACK-405 Removed redundant code in XMPPConnection.shutdown()
...
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_1@13690 b35dd754-fafc-0310-a699-88a17e54d16e
2013-06-22 17:02:09 +00:00
Florian Schmaus
cb5e1dc94b
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/branches/smack_3_3_1@13689 b35dd754-fafc-0310-a699-88a17e54d16e
2013-06-22 17:01:58 +00:00
Florian Schmaus
30bc5afa2b
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.
...
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_1@13688 b35dd754-fafc-0310-a699-88a17e54d16e
2013-06-22 17:01:40 +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
18a603d932
SMACK-428 add 'public int RosterEntry.hashCode()'
...
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_1@13662 b35dd754-fafc-0310-a699-88a17e54d16e
2013-05-17 22:05:57 +00:00
Florian Schmaus
6eb4b39716
Spelling fixes
...
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_1@13661 b35dd754-fafc-0310-a699-88a17e54d16e
2013-05-17 22:05:40 +00:00
Florian Schmaus
8e10e5f374
SMACK-369 remove try/catch block in XMPPConnection.connect()
...
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_1@13660 b35dd754-fafc-0310-a699-88a17e54d16e
2013-05-17 22:05:24 +00:00
Florian Schmaus
0951420d9c
SMACK-439
...
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_1@13659 b35dd754-fafc-0310-a699-88a17e54d16e
2013-05-17 22:04:31 +00:00
Florian Schmaus
a934624787
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/branches/smack_3_3_1@13658 b35dd754-fafc-0310-a699-88a17e54d16e
2013-05-17 22:04:04 +00:00
Florian Schmaus
10a317f570
Created 3.3.1 branch
...
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_1@13657 b35dd754-fafc-0310-a699-88a17e54d16e
2013-05-17 21:48:30 +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