1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-24 07:12:05 +01:00
Commit graph

3152 commits

Author SHA1 Message Date
Florian Schmaus
874a22489e Remove resource binding out of sasl auth
Follow XEP-170 recommendations: Resource binding *after* compression.

Fixes also a bunch of race conditions related to the wait()/notify()
pattern used in the early stages of a Connection where
createPacketCollectorAndSend(Packet).nextResultOrThrow() can not be
used. Those wait()/notify() patterns are currently
- SASL authentication
- compression
- resource binding

Fixes SMACK-454
2014-04-28 07:58:34 +02:00
Florian Schmaus
d17f64ed9a Improve stream compression for TCP connections
Fix a race condition in useCompression where the compression request was
send outside the synchronized block, this could cause notify() to be
called without a previoius call to wait().

s/streamCompressionDenied/streamCompressionNegotiationDone/ and re-use
the method once the server ack'd stream compression.

Also don't call notifyConnectionError() when requestStreamCompression()
encounters an exception, instead throw the exception.
2014-04-27 11:39:38 +02:00
Florian Schmaus
9b235d0d8f Improve javadoc of Java7ZlibInputOutputStream 2014-04-27 11:04:15 +02:00
Florian Schmaus
86ad192bea Log connectionClosedOnError exceptions 2014-04-27 10:49:58 +02:00
Florian Schmaus
790ebeca33 Make PacketReader.resetParser() throw the exception
there is no need to catch it and disguise it.
2014-04-27 10:49:58 +02:00
Florian Schmaus
a613d5f574 Improve PacketReader startup()
Instead of using the connectionID, we now use a new boolean
lastFeaturesParsed to mark when startup() is able to continue or when a
NoResponseException should be thrown.

Fixes the problem when the connectionId was set and the wait() would
timeout, resulting in startup() believing that everything was ok, while
in fact the features where not yet received (or parsed). SMACK-558.
2014-04-27 10:49:56 +02:00
Florian Schmaus
76ce883ef3 Simplify PacketReader wait/notify code
by removing the support for non XMPP 1.0 servers.
2014-04-27 10:49:23 +02:00
Florian Schmaus
2cd7bbadc5 Remove try/catch in startTLSReceived
as exceptions are catched further up the call stack.
2014-04-26 19:19:29 +02:00
Florian Schmaus
08cec251c7 Add missing HOXT entry in toc.html 2014-04-26 19:19:29 +02:00
Florian Schmaus
6e08a10186 Move Packet 'properties' from core to extensions
Code for Jive's packet properties should not be in 'core'. Also
de-serializing input from network causes some security implications, it
is therefore disabled as default.
2014-04-26 19:13:27 +02:00
Florian Schmaus
c2b214f8d8 Remove reply timeout from RemoteCommand
it was unused because of the value from nextResultOrThrow() was used
anyways (which uses the default of the connection instance).
2014-04-23 10:08:54 +02:00
Florian Schmaus
f5276a78c2 Fix javadoc of useCompression()
smackx.jar no longer need to be in the classpath in order to use
compression.
2014-04-23 10:08:54 +02:00
Florian Schmaus
069e7d7e60 Use connection specific reply timeout value
instead of the global default one.
2014-04-23 10:08:51 +02:00
Florian Schmaus
439f4cd291 Use volatile instead of synchronized
in LastActivityManager.
2014-04-23 09:43:48 +02:00
Florian Schmaus
0996a44a61 Replace sync block with sync method
in XMPPTCPConnection.
2014-04-23 09:43:22 +02:00
Florian Schmaus
5b8fd51345 Replace printStackTrace() with call to Logger 2014-04-23 09:37:16 +02:00
Florian Schmaus
cf6076ce43 Remove unnecessary try/catch blocks in DirectoryRosterStore 2014-04-23 09:31:52 +02:00
Florian Schmaus
4e43292f1d Don't overwrite SSLSocket settings
SoTimeout defaults to 0 anyways, and keep alive should be
enabled/disabled on the underlying socket.
2014-04-22 22:50:17 +02:00
Florian Schmaus
e2bca403e0 Improve proceedTLSReceived() documentation 2014-04-22 22:45:20 +02:00
Florian Schmaus
3de8af6865 callConnectionAuthenticatedListener() should call authenticated()
not connected().
2014-04-22 21:36:05 +02:00
Florian Schmaus
865168688d Fix PrivateDataManager getInstanceFor() always returns null 2014-04-22 21:36:05 +02:00
Florian Schmaus
075308a7cd Fix typo in Roster.java: s/iss/is/ 2014-04-22 21:36:05 +02:00
Florian Schmaus
b4c338b6e5 Smack 4.0.0-rc2-SNAPSHOT 2014-04-22 21:35:54 +02:00
Florian Schmaus
9e79fa4d12 Smack 4.0.0-rc1 2014-04-17 13:47:19 +02:00
Florian Schmaus
02d73f723f Change keyringfile example to real file
I'm always using the file and forget to s/foo/flo/
2014-04-17 13:47:19 +02:00
Florian Schmaus
4483e2bbd0 Make gradle use the local maven cache 2014-04-17 13:43:36 +02:00
Florian Schmaus
649f7af276 Move gradle signing code out of allprojects
because it caused asking for the key passphrase multiple times, i.e. for
every subproject.
2014-04-17 12:53:39 +02:00
Florian Schmaus
bd5ceded37 Provide a MUC method to create *or* join a room
MulitUserChat.create() will throw an SmackException if the MUC service
does not return a 201 status when entering a room. Some MUC
implementations don't return the 201 status but instead behave like
the room already existed.

If the user doesn't care about the room beeing locked until the
initial configuration has been send, he can now use the new
MutliUserChat.createOrJoin(String) method.

Also remove some duplicate code by creating the private enter() method.

Fixes SMACK-557
2014-04-17 12:14:35 +02:00
Florian Schmaus
8ba0715cc3 Bump jbosh to 0.8.0 2014-04-17 12:13:56 +02:00
Florian Schmaus
b4eb8ad182 Javadoc fixes
- Add hint to reconnection configuration
- s/connection.getChatManager/ChatManager.getInstanceFor(connection)
- typos
2014-04-15 11:31:47 +02:00
Florian Schmaus
0136c3eb81 Return List instead of Collection where appropriate 2014-04-14 14:09:53 +02:00
Florian Schmaus
61fd3c9dd0 Add FromMode regarding 'from' attribute of outgoing stanzas
XMPP Servers should ignore the 'from' attribute of outgoing
stanzas. Makes the behavior how Smack populates the 'from' attribute of
outgoing stanzas configurable. Fixes SMACK-547
2014-04-14 11:01:26 +02:00
Florian Schmaus
c3cb98a116 Make ConnectionConfugration getters public
No need to keep them package-private. SMACK-556
2014-04-10 21:12:12 +02:00
Florian Schmaus
4cff008708 Return Collections (or sublcasses) instead of Iterators
This allows us to exploid Java 8 streams and Java 5 for-each
loops. The returned Collections are usually unmodifiable. We decided
against returning Iterable because this would mean determining the
size in O(n) compared to Collection.size() which is often faster
(e.g. O(1)).
2014-04-09 20:03:10 +02:00
Florian Schmaus
6ea1d65e73 Remove star imports in VCardProvider 2014-04-09 20:03:10 +02:00
Florian Schmaus
f33b9f08d4 VCardProvider should treat tel code element optional
SMACK-555
2014-04-09 20:03:10 +02:00
Georg Lukas
ab70cfec24 Refactoring: All connection classes begin with XMPP now
This commit renames classes as follows:
 * TCPConnection --> XMPPTCPConnection
 * BOSHConnection --> XMPPBOSHConnection

There are two reasons for this rename. First, it is there to indicate
that the classes actually _are_ XMPP connections, using different
transport mechanisms. Second, it makes auto-completion in IDEs easier,
the developer can type XMPP<complete> and choose the right backend.
2014-04-09 20:03:07 +02:00
Florian Schmaus
c86d6e3b61 Update README.md's ChatManager example to new API 2014-04-08 18:26:47 +02:00
XiaoweiYan
afa4ce5773 Fix not-well-format packet exception when set property for packet 2014-04-08 12:04:56 +02:00
Florian Schmaus
5832236578 Cleanup SASLErrorException
Reuse the constructor and append only the SASLError String to the
Exceptions message (previously the full SASLError stanza was printed).
2014-04-05 18:42:32 +02:00
Florian Schmaus
0c29fdb769 Use WeakHashMap in BookmarkManager and PrivateDataManager
Also remove the "other user" constructor fo PrivateDataManager, as
this feature is not specified by XEP-49.

Fixes SMACK-554
2014-04-04 11:55:06 +02:00
Florian Schmaus
ef43ba6322 Fix or suppress warnings 2014-04-03 23:06:26 +02:00
Florian Schmaus
d8a5610d7b Use Locale.US when doing String operations
on machine readable output. The default locale may not provide the
wanted mapping. See also
http://developer.android.com/reference/java/util/Locale.html#default_locale

SMACK-467
2014-04-03 22:50:13 +02:00
Florian Schmaus
94adaf8e50 Always transform 'from' to lower case in FromMatchesFilter 2014-04-03 14:36:08 +02:00
Florian Schmaus
a016910baf Use toLowerCase(Locale.US) in FromMatchesFilter 2014-04-03 14:35:10 +02:00
Florian Schmaus
4a60a68802 Move DEBUG_ENABLED from XMPPConnection to SmackConfiguration 2014-04-03 13:10:30 +02:00
Florian Schmaus
3c2f794522 Remove no-ops in TCPConnection
those are the defaults anyway.
2014-04-03 13:08:42 +02:00
Florian Schmaus
bd96816102 Add setter and javadoc for packet reply timeout 2014-04-03 10:59:00 +02:00
Florian Schmaus
246e7b85f8 Use connection's reply timeout value in MultiUserChat 2014-04-03 10:58:50 +02:00
Florian Schmaus
665d65836c Cleanup of pingMyServer() API
only throw NotConnectedException, otherwise return false. Before as
some sort of exception was always thrown in the error case.
2014-03-28 16:20:09 +01:00