1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-11-12 15:22:05 +01:00
Commit graph

98 commits

Author SHA1 Message Date
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
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
069e7d7e60 Use connection specific reply timeout value
instead of the global default one.
2014-04-23 10:08:51 +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
3de8af6865 callConnectionAuthenticatedListener() should call authenticated()
not connected().
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
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
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
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
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
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
bd96816102 Add setter and javadoc for packet reply timeout 2014-04-03 10:59:00 +02:00
Florian Schmaus
17a254edca Fix SmackConfiguration disabledSmackClasses
contains() should ckeck against 'classToLoad' not 'name'.
2014-03-28 14:46:30 +01:00
Florian Schmaus
a83b44e102 Add support for CustomSmackConfiguration class
with DISABLED_SMACK_CLASSES String[] option.
2014-03-28 14:46:30 +01:00
Florian Schmaus
a1227b78cc Fix log message in SmackConfiguration
Those startup classes could be specified in other files besides
smack-config.xml
2014-03-28 14:46:30 +01:00
Florian Schmaus
8321948b3c Add log to DNSUtil 2014-03-28 14:46:30 +01:00
Florian Schmaus
fa71ff9605 Fixed NPE in FromMatchesFilter
in cases where a 'null' FromMatchesFilter was used and the processed
message would have a non-null 'from' attribute.

Thanks to sylvia for reporting this.
2014-03-28 14:46:30 +01:00
Florian Schmaus
c59a6010e1 Return empty list instead of null in DNSUtil 2014-03-28 14:46:30 +01:00
Florian Schmaus
dce0c55011 Remove cache from DNSUtils
Caching of DNS RR should happen on the lowest possible layer, not within Smack:
- dnsjava does it's own caching
- resolving via the javax API should use the OS's caching (if any)

We don't need dozens layers of DNS RR caching.
2014-03-28 14:46:30 +01:00
Florian Schmaus
2250944ca6 Further improved logging in SmackConfiguration 2014-03-28 14:46:30 +01:00
Florian Schmaus
53ca314b50 Cleanup SASLAuthentication
- Synchronized as method keyword
- Removed star import
2014-03-28 14:46:30 +01:00
Florian Schmaus
2619a63c21 Log loaded classes by SmackConfiguration 2014-03-28 14:46:30 +01:00
Florian Schmaus
010a86444a Streamline LastActivity API, add enable/disable
Allow LastActivity to be enabled/disabled. The API is now similar to the
ones of the other Managers. Added unit tests.
2014-03-23 14:19:05 +01:00
Florian Schmaus
978f692eb0 Use XmlStringBuilder in most toXML() bodies
Also change StringUtils.escapeForXML() and Packet.toXML() to return
CharSequence instead of String. XmlStringBuilder now has 'optX' methods.

Remove XmlUtils in favor of XmlStringBuilder
2014-03-22 16:59:15 +01:00
Florian Schmaus
1cf4681581 Always lookup DNS SRV RR on connect() 2014-03-20 17:08:46 +01:00
Florian Schmaus
363354f237 Make DirectoryRosterStore use elements for whitespace content
If whitespace (e.g. \n \t) needs to be preserved, then XML elements
should be used instead of attributes. Since we do this now in
DirectoryRosterStore, there is also no longer a need for an
specialized StringUtils.escapeForXML().

Also introduce XmlStringBuilder, which should become the default way
to implement Packet.toXML() and the like.
2014-03-20 14:35:38 +01:00
Florian Schmaus
6b4c53bfc5 Renamed DefaultRosterStore to DirectoryRosterStore 2014-03-20 13:36:08 +01:00
Florian Schmaus
1bf57cb6a1 Move file related methods to FileUtils 2014-03-20 13:26:57 +01:00
Florian Schmaus
fcc8414a92 "not connected" is now a checked Exception thrown by sendPacket()
There is a unsolveable race condition between the connection state and
sendPacket(), i.e. the connection could go down, right after the
method calling sendPacket is called, but before sendPacket() is
invoked. Before this change, sendPacket() has thrown an unchecked
IllegalStateException, which could be ignored by the Smack user, who
would also not notice the race condition. We have decided to throw a
checked Exception in this case now, to make the Smack user aware of
this situation.

SMACK-426
2014-03-19 15:56:41 +01:00
Florian Schmaus
d349940537 Move DNS resolving into connect()
It was misplaced in ConnectionConfiguration anyways, as the sole
instantiation of a ConnectionConfiguration should not cause any network
I/O.
2014-03-19 13:14:03 +01:00
Florian Schmaus
dbab9b8995 Unify StringUtils.escapeForXML()
Rework StringUtils.escapeForXML() so that it can be used also for
StringUtils.xmlAttribEncodeBinary(). escapeForXML() now uses a
switch/case statement, which should leave the (JIT) compiler more room
for optimizations.

Removing the "do not escape unicode character references", because
this behavior, introduced with
8264ebdfb5, is incorrect.
2014-03-19 13:13:02 +01:00
Florian Schmaus
c592b4f046 Improve Exceptions (SMACK-426) 2014-03-19 09:00:10 +01:00
Florian Schmaus
44a5408bc0 Move host/port from ConnectionConfiguration to XMPPConnection
There semantic is that they now report the host used to establish the
connection. Therefore BOSHConfiguration needs to hostAddresses for
getURI().
2014-03-19 09:00:10 +01:00
Florian Schmaus
81d49d2f60 ChatManager should not throw a NPE if 'from' is null
Fixes SMACK-551
2014-03-19 09:00:10 +01:00
Florian Schmaus
4db967079f getInstanceFor() for ChatManager and AccountManager 2014-03-19 08:59:45 +01:00
Florian Schmaus
6197f6200f Move duplicate sendPacket() code into XMPPConnection 2014-03-17 19:52:52 +01:00
Florian Schmaus
c3f9ec4f94 Return the group if it exists in Roster.createGroup() 2014-03-17 19:21:20 +01:00
Florian Schmaus
a46d02ca32 Remove old Apache commons collections from codebase
ChatManager's Chat instances are now removed by Chat.close(), removing
the need for a Map with Hard to Weak references.

ChatStateManager can simply use WeakHashMap.
2014-03-17 14:47:55 +01:00
Florian Schmaus
f73a3afbca Add Chat.close() (SMACK-356) 2014-03-17 09:14:17 +01:00