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

3164 commits

This branch
This branch
All branches
Author SHA1 Message Date
Florian Schmaus
0c8199650b Improve parsing exception callback. 
Fixes SMACK-631.
 2015-05-18 12:38:25 +02:00
Florian Schmaus
21c7007212 Make Roster.waitUntilLoaded() package-private 
there is no point in having it 'protected', since Roster is not
subclassable.
 2015-05-15 17:04:10 +02:00
Florian Schmaus
8dd12e7220 Try that Roster is loaded after Roster.getInstaceFor(XMPPConnection) 
Fixes SMACK-633
 2015-05-15 17:02:52 +02:00
Florian Schmaus
001e824fb9 Improve PubSub API 
Use Manager pattern for PubSubManager.

Also improve the API of ServiceDiscoverManager.
 2015-05-12 17:56:06 +02:00
Florian Schmaus
9e351f0535 s/MucConfigurationNotSupported/MucConfigurationNotSupportedException/ 2015-05-12 11:56:03 +02:00
Florian Schmaus
ff72ea320c Check if MUC room is hosted on a MUC service 
when trying to enter a room.
 2015-05-12 11:54:54 +02:00
Florian Schmaus
d97b115170 Smack 4.1.2-SNAPSHOT 2015-05-09 15:43:14 +02:00
Florian Schmaus
bbc7aaae77 Smack 4.1.1 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQF8BAABCgBmBQJVTgmuXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQxMzU3QjAxODY1QjI1MDNDMTg0NTNEMjA4
 Q0FDMkE5Njc4NTQ4RTM1AAoJEIysKpZ4VI41MXUH/3A5Jc6rzALhnXMT4yj+jXow
 rLLX5/ypOvkAXEMRlTf9xd2apz4hT8dMsBcL3JvZscuVmkw0/woh9eV/PFSDoc7t
 HA7bMZRqWqUuVOezFD0ggHsJ7zfpcIuxsgoNARQlCRMPHzCLzKhMNctz5UApAdfy
 +wPpTMpc3K5SM1bNlM60qp+dbPCqQcLwYP02KrOQASgenVDm6iKFpzx0ieVpPY1M
 hOBMyaZg3n2j+267gpqBG6c7PVmEq3deAlB6BOBAsL/Bp1w5B5Smq959LWJLstrU
 /LeYJFi1TeIASiFy1vZyTV0Tw+Pe++3gB6ppLqkQhfWV8vXzm0coCXx29qWxAzM=
 =pGJt
 -----END PGP SIGNATURE-----

Merge tag '4.1.1'

Smack 4.1.1

Conflicts:
	smack-extensions/src/main/java/org/jivesoftware/smackx/caps/provider/CapsExtensionProvider.java
	smack-im/src/main/java/org/jivesoftware/smack/roster/RosterEntry.java
	smack-java7/src/main/java/org/jivesoftware/smack/java7/Java7SmackInitializer.java
	version.gradle
 2015-05-09 15:42:09 +02:00
Florian Schmaus
56847d7f14 Smack 4.1.1 2015-05-09 15:18:38 +02:00
Florian Schmaus
236dfb009d Improve logging of parsing errors 2015-05-07 22:40:38 +02:00
Florian Schmaus
36cc05a507 Use Resourcepart as type for the resource 2015-05-04 20:53:00 +02:00
Florian Schmaus
9354e4fb74 Rework and improve authentication API and internals 
Add

- performSaslAnonymousAuthentication()
- performSaslExternalAuthentication(SSLContext)
- addEnabledSaslMechanism(String)
- addEnabledSaslMechanisms(Collection<String>)

to ConnectionConfiguration.Builder.

Instead of providing a special API call for anonymous authentication,
Smack now has a configuration builder method to set anonymous/external
authentication. This also removes a lot of duplicate code within
Smack.

Also move SASLAnonymous into o.j.smack.sasl.core.

Fixes SMACK-629.
 2015-05-03 22:00:41 +02:00
Florian Schmaus
65dd6c9777 Fix RosterEntry.setNames(String) 
also mark the method synchornized, to prevent race conditions with the
name.

Fixes SMACK-662.
 2015-04-30 11:43:54 +02:00
Florian Schmaus
4eb322608e Add ConnectionConfiguration.setProxyInfo(ProxyInfo) 
Fixes SMACK-661.
 2015-04-27 17:51:18 +02:00
Florian Schmaus
a4be67ff5d Fix ReconnectionManager RANDOM_INCREASING_DELAY policy 
which was using the same value. Fixes SMACK-660.
 2015-04-27 17:35:00 +02:00
Florian Schmaus
e0bc1ccaf2 Fix memory leak in RosterEntry 
Roster's INSTANCE map has a weak reference to XMPPConnection, which has
a field of RosterEntry(ies), and RosterEntry has a strong reference to
XMPPConnection resulting in a cycle which is preventing XMPPConnection
from getting gc'ed.

SMACK-659.
 2015-04-27 07:27:40 +02:00
Florian Schmaus
f579fb2c77 Throw exception if smack-java7 is loaded on Android 2015-04-25 22:53:46 +02:00
Florian Schmaus
51700400bc Remove never-thrown exception declarations 2015-04-25 22:46:56 +02:00
Florian Schmaus
c7454ce968 Remove unnecessary cast 2015-04-24 21:33:23 +02:00
Florian Schmaus
221b81a627 Delete accounts created by LowLevelIntegrationTest performCheck() 
those where created but not deleted.
 2015-04-24 21:33:20 +02:00
Florian Schmaus
fcc62ad131 Add support for MUC roomnick rewrite 
SMACK-646
 2015-04-23 23:11:40 +02:00
Florian Schmaus
5af4f1a5d1 Synchronize MultiUserchat.changeNickname(Resourcepart) 2015-04-23 21:45:33 +02:00
Florian Schmaus
475fed8c51 Fix DeliveryReceiptsManager.autoAddDeliveryReceiptRequests 
Must use interceptors instead of sending listeners, as those are
invoked *after* the stanza has been put on the wire. Also use the
correct filter, which excludes ack messages.

Fixes SMACK-656.
 2015-04-23 21:31:09 +02:00
Florian Schmaus
00a7556bfe Fix StreamManagementTest in smack-integration 
Since 6c637d5784 connect() does not longer
automatically perform a login.

Also verify the message bodies in the test.
 2015-04-22 22:45:15 +02:00
Florian Schmaus
0efdc4018f Use XMPPConnection.toString() in SmackIntegrationTestFramework 2015-04-22 22:31:58 +02:00
Florian Schmaus
17103def0b Change SmackExecutorthreadFactory constructor parameter to XMPPConnection 2015-04-22 09:45:02 +02:00
Florian Schmaus
7c3f4b7129 Add AbstractXMPPConnection.toString() 2015-04-22 09:28:30 +02:00
Florian Schmaus
bfb3f5cd95 Retry to delete integration test accounts 
in the the connection was terminated because of an error, try to
re-establish the connection when trying to delete the account.
 2015-04-22 09:23:22 +02:00
Florian Schmaus
f274581c27 Add MucBookmarkAutojoinManager 
Also add MucConfigFormManager and improve the MUC API (SMACK-648). Bump
to jxmpp 0.5.0-alpha3.

Improve and extend PrivateDataManager and BookmarkManager.
 2015-04-21 19:31:10 +02:00
Florian Schmaus
265e5c69d5 Use LinkedHashMap for form fields 
for efficient lookup.
 2015-04-12 19:27:22 +02:00
Florian Schmaus
189f524195 Make SynchronizationPoint interruptible 
SMACK-632
 2015-04-12 18:33:43 +02:00
Florian Schmaus
4a16ab9329 Merge branch '4.1' 
Conflicts:
	version.gradle
 2015-04-12 18:32:55 +02:00
Florian Schmaus
00ba5ae3df Replace PrivateDatamanager.getProviderKey with JXMPP method 2015-04-12 18:24:52 +02:00
Florian Schmaus
062e9ee415 Fix javadoc of pubsub.Item 2015-04-12 18:13:19 +02:00
Florian Schmaus
e3dced6eea Fix NPE in Roster if 'from' is null 2015-04-12 16:22:41 +02:00
TheHaf
a53894a65b Fix typo in exception 2015-04-09 21:16:05 +02:00
Florian Schmaus
1eb315d6b7 Add Manager.getAuthenticatedConnectionOrThrow() 2015-04-09 19:00:03 +02:00
Florian Schmaus
9a69f992c4 Deprecate SynchronizationPoint.reportFailure() 
assert and document that an exception must be set when calling
reportFailure(E).
 2015-04-07 08:52:48 +02:00
Florian Schmaus
dabbb40de6 Fix isSmResumptionPossible() returning wrong values 
The cases where reversed. Change the condition for better readability.

Also fix int and long handling in the computation of
maxResumptionMillies.

Fixes SMACK-654.
 2015-04-07 08:51:03 +02:00
Florian Schmaus
3b6891b0d0 Fix integer overflow if no max resumption time 
is specified by client and server.

Fixes SMACK-653.
 2015-04-07 08:51:03 +02:00
Florian Schmaus
cca34fd872 First check condition, then remaining wait in SynchronizationPoint 
as otherwhise SynchronizationPoint may report NoResponseException when
there was in fact a success or failure reported in case there are
multiple threads waiting for the condition.
 2015-04-07 08:51:03 +02:00
Florian Schmaus
83aa6838d9 Use signalAll in SynchronizationPoint 
to prevent a thread from not being notified about a change of the state
of the SynchronizationPoint.

If two threads are waiting for a change, which could happen e.g. because
of a connectivity change and one thread does instantShutdown() while the
other handles connectionClosedOnError(), then only one thread, usually
the one handling connectionClosedOnError(), would be notified and
resumed.

Fixes SMACK-652.
 2015-04-07 08:51:03 +02:00
Florian Schmaus
57fa631480 Add javadoc to SynchronizationPoint 2015-04-07 08:50:52 +02:00
Florian Schmaus
dddba8f08c Allow Roster for anonymous connections 
Fixes SMACK-628.
 2015-04-06 13:56:32 +02:00
Florian Schmaus
6c637d5784 Don't automatically login() on connect() 
if the connection was authenticated before.

Fixes SMACK-647.
 2015-04-06 13:51:47 +02:00
Florian Schmaus
b4694ec152 Add FinalClass checkstyle check 
And mark affected classes final.
 2015-04-06 10:45:12 +02:00
Florian Schmaus
5ae1fbd25a Remove no longer required checkstyle supression 2015-04-05 10:55:33 +02:00
Florian Schmaus
38dc59eb8e Fix assert in TestResult 
sometimes the unit test where failing because the assert '>' didn't
hold. Use '>=' instead now.
 2015-04-05 10:49:14 +02:00
Florian Schmaus
0a6ac76447 Remove package-info.java from test packages 
as otherwhise eclipse will complain "The type package-info is already
defined".
 2015-04-05 10:48:00 +02:00
Florian Schmaus
ee429b5d8b Use UTF-8 as charSet for javadoc 2015-04-05 08:26:58 +02:00