2095 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Florian Schmaus	34bc13bec7	Merge branch '4.0' ... Conflicts: build.gradle smack-core/src/main/java/org/jivesoftware/smack/PacketCollector.java smack-core/src/main/java/org/jivesoftware/smack/packet/XMPPError.java smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java smack-core/src/main/java/org/jivesoftware/smack/util/StringUtils.java smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/ItemProvider.java	2014-09-05 22:11:35 +02:00
Florian Schmaus	bf99227296	Smack 4.0.5-SNAPSHOT	2014-09-05 21:59:52 +02:00
Florian Schmaus	7bf31bc2e4	Smack 4.0.4	2014-09-05 21:59:35 +02:00
Florian Schmaus	af9b9a8769	Split SmackConfiguration into Configuration and Initalization ... also add SmackConfiguration.addDisabledSmackClass()	2014-09-05 15:56:00 +02:00
Florian Schmaus	08504fdb48	Add info about open_chat to README.md	2014-09-05 11:58:18 +02:00
Florian Schmaus	28c3554085	Use switch/case in MUCUserProvider	2014-09-05 11:46:44 +02:00
Florian Schmaus	afd7c67bf9	Add support for multiple status codes to MUCUser ... Fixes SMACK-604	2014-09-05 11:45:06 +02:00
Florian Schmaus	5d4aa76d19	Create smack.util.stringencoder for Base64, Base32,… ... Use Android's Base64 implementation when on Android, otherwise, when on Java7, use the existing one.	2014-09-04 11:07:55 +02:00
Florian Schmaus	90c0064394	Add XmlLangStanza, to share the language field ... between Message and Presence.	2014-09-03 18:11:32 +02:00
Florian Schmaus	67011fc322	Remove xmlns field from Packet ... Stanzas do not have a xmlns attribute in their top level element.	2014-09-03 17:56:51 +02:00
Florian Schmaus	644ddf3d4c	Presence class cleanup	2014-09-03 17:50:12 +02:00
Florian Schmaus	66be759ce6	Add support for presence probes	2014-09-03 17:32:41 +02:00
Florian Schmaus	5342aaf137	Make XMPPError.Condition.equals null-safe ... also make Condition implement CharSequence. SMACK-603	2014-09-01 10:13:23 +02:00
Florian Schmaus	72557dd354	Make PacketCollector handle InterruptedException ... Fixes SMACK-602	2014-08-29 18:09:45 +02:00
Florian Schmaus	b5b134f569	Process all XML namespaces in PubSub ItemProvider ... Fixes SMACK-601	2014-08-29 14:59:54 +02:00
Florian Schmaus	e8471baccb	Add ChatState.getChatState()	2014-08-28 19:00:01 +02:00
Florian Schmaus	393c713471	Don't repeat documentation, link to it instead ... also fix some typos and improve some markdown formatting.	2014-08-28 15:26:02 +02:00
Florian Schmaus	5a5524623c	Make presence parsing more robust ... by allowing 'show' to be an empty element: '<show />'	2014-08-28 14:14:18 +02:00
Florian Schmaus	218dc66cf7	Filetransfer API should not wrap IOException ... into SmackException.	2014-08-26 15:26:37 +02:00
Florian Schmaus	6af5d5e462	SDM: Follow guidelines, perform put() where get() is performed	2014-08-26 13:50:47 +02:00
Florian Schmaus	5d159c4be2	Make ServiceDiscoveryManager use constant PacketFilters	2014-08-26 13:50:47 +02:00
Florian Schmaus	191c4429da	Fix FileTransferManager invoking request listeners ... those need to be called asynchronously. Also add a small API for that.	2014-08-26 13:50:42 +02:00
Florian Schmaus	856b4a6090	Make FaultTolerantNegotiator respect packetReplyTimeout	2014-08-26 12:04:52 +02:00
Florian Schmaus	02228702da	Make XmlStringBuilder equals() CharSequence aware ... The minimal condition in order to check equality in XmlStringBuilder is that 'other' implements the CharSequence interface. Not as it was previously, that it's also a XmlStringBuilder. This allows junit's assertEquals() to be used (to a certain extend).	2014-08-25 13:46:05 +02:00
Florian Schmaus	f282323eec	Extend RoomInfo to contain more meta-data ... found in the extended disco info result form. See also http://xmpp.org/extensions/xep-0045.html#disco-roominfo Fixes SMACK-542 Also change getShortDescription() to getName()	2014-08-25 11:39:57 +02:00
Florian Schmaus	6a43fc7c36	Add shortDescription to RoomInfo ... which is obtained from the disco#info result's identity. Fixes SMACK-600. Also make fields in RoomInfo final.	2014-08-24 20:00:35 +02:00
Florian Schmaus	e19cfa4d83	Introduce MUCRole and MUCAffiliation enums ... Also rework MUCItem and parseItem to follow current coding guidelines.	2014-08-24 18:30:18 +02:00
Florian Schmaus	754bdada18	MultiUserChat grant/revoke Admin must use #admin namepsace ... SMACK-371	2014-08-24 17:49:08 +02:00
Luke GB	659714c2be	Set jid to passed parameter, not null ... Setting `jid` to `null` was probably not the intended behaviour of this constructor and means that the `IQReplyFilter` will later reject responses that it shouldn't, because the `AbstractXmppConnection` will automatically construct a JID based on the authenticated username. In particular, this breaks attempting to connect to the PVP.net XMPP server.	2014-08-23 18:41:35 +02:00
Florian Schmaus	229e526f6d	Make AbstractDelayInformationProvider handle empty string as reason	2014-08-21 19:47:31 +02:00
Florian Schmaus	28629e0e7f	Fix wrong boolean condition in async API ... inverse boolean condition, correct is: "if packetListener has been removed, then we received no response" and add check for exceptionCallback being null.	2014-08-21 12:02:32 +02:00
Florian Schmaus	76f8895ae3	Remove Pong class, add NAMESPACE to Ping ... The Pong class was harmful, as people could try to use it with PacketTypeFilter, which wouldn't work, a Pong is just a plain IQ result without child XML.	2014-08-21 10:55:33 +02:00
Florian Schmaus	bbf89c65bf	Fix typo in XmlStringBuilder, it's not an Angel ... s/rightAngelBracket/rightAngleBracket/	2014-08-20 21:25:14 +02:00
Florian Schmaus	066a4d6c9e	Add maybeCheckForSnapshotDependencies to build.gradle ... to check for Snapshot dependencies in release builds.	2014-08-20 20:53:17 +02:00
Florian Schmaus	eeea0e34ca	Add '::1' to the loopbackAddresses	2014-08-20 18:12:48 +02:00
Florian Schmaus	47ffcd8b6d	Merge branch '4.0'	2014-08-20 15:29:29 +02:00
Florian Schmaus	1e5f0eb749	Make parseElementText handle empty string elements ... ie. elements which only content is the empty string, for example <body></body>. Fixes SMACK-598	2014-08-20 15:23:52 +02:00
Florian Schmaus	aa14f55902	Updated providers.md: s/.getInstance()// ... As ProviderManager has now only static methods	2014-08-20 12:33:15 +02:00
Florian Schmaus	b9b43ad5d7	Make the next server ping code easier to read	2014-08-20 10:44:02 +02:00
Florian Schmaus	e16997eb9d	Fix PingServerRunnable scheduling ... should be nextPingIn and not pingInterval.	2014-08-20 10:35:45 +02:00
Florian Schmaus	64e49cb934	Add getLastStanzaReceived() to XMPPConnection ... also remove faulty PongFilter from PingManager. It never matched any stanzas, since a Pong is just a plain result IQ that is not qualified by any XMPP Ping namespace. Fixes SMACK-597	2014-08-20 10:35:17 +02:00
Florian Schmaus	f65c0d5528	Renamed smack-jingle to smack-jingle-old ... Also renamed package name from org.jivesoftware.smackx.jingle to org.jivesoftware.smackx.jingleold	2014-08-20 00:26:02 +02:00
Florian Schmaus	6ab2bf9fe0	Also log the exception in parsePresence() ... when parsing packet extensions.	2014-08-19 22:14:47 +02:00
Florian Schmaus	62893376dd	Cleanup Bytestream and Streamhost ... remove unnecessary setPort() setter.	2014-08-19 19:24:57 +02:00
Florian Schmaus	b468a29881	Improve Socks5 Bytestreams ... - determine all local IPv4 and IPv6 addresses - prevent loopback addresses from appearing as streamhost Some unit tests where changed because they assumed that a host only has one local address. But nowadays hosts often have more, at least because they are IPv4 and IPv6 multi-homed.	2014-08-19 19:00:43 +02:00
Florian Schmaus	650da55b23	Improve XmlStringBuilder usage in Bytestream	2014-08-19 12:43:21 +02:00
Florian Schmaus	6021f8a8ce	Fix Bytestream.getChildElementXML returning invalid XML	2014-08-19 12:42:23 +02:00
Florian Schmaus	24f7de8d54	Merge branch '4.0' ... Conflicts: build.gradle	2014-08-19 11:32:57 +02:00
Florian Schmaus	a49eac7c00	Ensure javac uses uft8 as encoding	2014-08-19 11:32:40 +02:00
Florian Schmaus	9eb5c2a49d	Load roster before sending the initial presence ... SMACK-596	2014-08-19 11:31:47 +02:00