vanitasvitae
/
Smack
mirror of https://github.com/vanitasvitae/Smack.git
1
0
Fork 0
Code Issues Releases Wiki Activity
2,706 Commits 61 Branches 35 Tags 36 MiB
Commit Graph

98 Commits

Author SHA1 Message Date
Florian Schmaus 04a0004035 Smack 4.1.4 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQF8BAABCgBmBQJV9nAlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQxMzU3QjAxODY1QjI1MDNDMTg0NTNEMjA4
 Q0FDMkE5Njc4NTQ4RTM1AAoJEIysKpZ4VI41sFEIAJlfRspk6S5ymNc4w7u/FT1w
 MpHT/cxqIQIBU9J5dYqeW6Y8O6VuUeknCmZBEv7dIVHroTmvfosMauAyRZJXWeeL
 FQQTBqDJszYdM88x/d5X6d25lCEBdQkdDh2a5s9AIy9RH0iXE74AypuikbroK+VC
 zI3wRPUFq7WnARtmiP2NalSgSNv5ToeicBO+JSniQ+O52ZAlP2FSDfi4uzPPigdP
 Ip/V3eF4Bp0YZimcxAnWdnMU+ciVLClRYKgD3+qTEoic7dx3dzeTyrk1NoLRgQl9
 mfcNXBgUScHZAoSIkR0QiUx9ktPCJ950qa+XtW3B8NtDOZkXegUL/a8ukQAuz+k=
 =qMsC
 -----END PGP SIGNATURE-----

Merge tag '4.1.4'

Smack 4.1.4
 2015-09-14 09:05:24 +02:00
Florian Schmaus 6b7f69b42f Fix MUCs UserStatusListener 
use oldPresence instead of packet. This bug was introduced with
e6aa2416e4.

Fixes SMACK-693.
 2015-08-17 18:20:35 +02:00
Florian Schmaus ef8fa1fa46 Fix MUCRole and MUCAffiliation equal checks in MultiUserChat 2015-08-17 12:52:38 +02:00
Florian Schmaus d711caee38 Use EntityFullJid in MUC's getOccupant(Presence) API 
instead of String, which will always return null if used with
ocupantsMap.get(String), because String.equals(Object) is only true if
Object is also instanceof String.

Thanks to Adnan Elezovic for reporting.
 2015-08-12 10:22:11 +02:00
Florian Schmaus 19ebcb814b Check that service is MUC service in getHostedRooms() 
and otherwhise throw a NotAMucServiceException.
 2015-07-17 09:08:04 +02:00
Florian Schmaus 2e03f0f3f3 Improve HostedRoom API 
return EntityBareJid instead of Jid.
 2015-07-17 09:06:40 +02:00
Florian Schmaus 24365f0f1e Fix MultiUserChat javadoc 2015-07-15 22:37:49 +02:00
Florian Schmaus ea00caca31 Fix MultiUserChat.enter() 'nickname' check 
It's no longer necessary to check if 'nickname' is set. The
MucEnterConfiguration API already enforces that.
 2015-07-15 22:36:10 +02:00
Florian Schmaus 57cc3aa3f8 Add MucEnterConfiguration API 
Allows to configure the presence used when joining a MUC.

Part of SMACK-648: Improve the MUC API.
 2015-07-07 08:52:33 +02:00
Florian Schmaus c125a3b055 Bump jxmpp to 0.5.0-alpha4 2015-05-27 19:29:51 +02:00
Florian Schmaus f369a009ac Rename 'serviceName' to 'xmppServiceDomain' 
Also use 'null' as default value for the resource, to enforce server
generated resources.

Fixes Smack-665
 2015-05-19 09:26:59 +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 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 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 b4694ec152 Add FinalClass checkstyle check 
And mark affected classes final.
 2015-04-06 10:45:12 +02:00
Florian Schmaus de528eee67 Add JavadocPackage checkstyle 
change from package.html to package-info.java. Add missing
package-info.java with a placeholder description.
 2015-04-04 17:16:47 +02:00
Florian Schmaus 64d134052d Enable javadoc checkstyle 
and fix violations.
 2015-03-29 12:29:32 +02:00
Florian Schmaus 83b84c5bd3 Merge branch '4.1' 
Conflicts:
	smack-core/src/main/java/org/jivesoftware/smack/StanzaListener.java
	smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java
	smack-core/src/main/java/org/jivesoftware/smack/packet/Stanza.java
	smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java
	version.gradle
 2015-03-24 17:16:18 +01:00
Florian Schmaus 451eb4c826 Add missing break statements 2015-03-23 09:52:01 +01:00
Florian Schmaus f546d28ad8 Xlint all the things 
and fix all warnings.
 2015-03-23 09:28:49 +01:00
Florian Schmaus 5e86db4f80 Substitute 'packet' with 'stanza(/packet)' in javadoc 2015-03-21 09:36:28 +01:00
Florian Schmaus 8878cf3773 Add checkstyle check for trailing whitespace 2015-03-18 21:01:49 +01:00
Florian Schmaus 0fde39fa45 's;^\s+$;;' on all source files 
And add checkstyle test for lines containing only whitespace characters.
 2015-03-17 11:33:02 +01:00
meisterfuu 05c97c494b Add roomDestroyed callback to MUC UserStatusListener 
Fixes SMACK-619
 2015-03-17 09:51:20 +01:00
Florian Schmaus bc093b620d Make Provider.parse() just throw Exception 
instead of throwing XmlPullParserException, IOException and
SmackException.

Add a guard to AbstractXMPPConnection.processPacket() to always re-throw
RuntimeExceptions.
 2015-03-13 09:27:18 +01:00
Florian Schmaus 41b74ec13c Immutable objects must not implemented TypedCloneable 
also add a note about that to the developers documentation.
 2015-03-12 13:12:39 +01:00
Florian Schmaus 516e397679 Improve MUC's Destroy element class 
- Made jid of type BareJid
- Made it implement TypedCloneable
- Made it implement Serializable
- Made it immutable

Also update its parsing code. And add some convenience methods to
ParserUtils.
 2015-03-11 21:31:37 +01:00
Florian Schmaus 369878b6d9 Merge branch '4.1' 
Conflicts:
	version.gradle
 2015-03-11 20:51:08 +01:00
Florian Schmaus f6ba363843 Always include role in MUCItem if it's set 
As not including "role='none'" when kicking a user will result in an
XMPPErrorException. Also there appears to be nothing in XEP-45 which
says "if role is not set, then it defaults to 'none'".
 2015-03-11 12:36:15 +01:00
Florian Schmaus c540ac9703 Merge Smack 4.1.0-rc3 
Conflicts:
	smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/provider/BytestreamsProvider.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java
	version.gradle
 2015-03-07 21:31:56 +01:00
Florian Schmaus 48aae12ba3 Remove XMPPException from MultiUserChat.sendMessage 
as it's not actually thrown.
 2015-03-07 20:52:44 +01:00
Florian Schmaus 701aa7d9c4 Merge branch '4.1' 
Conflicts:
	smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java
	smack-core/src/main/java/org/jivesoftware/smack/PacketCollector.java
	smack-core/src/main/java/org/jivesoftware/smack/PacketListener.java
	smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java
	smack-core/src/main/java/org/jivesoftware/smack/debugger/SmackDebugger.java
	smack-core/src/main/java/org/jivesoftware/smack/packet/Packet.java
	smack-core/src/main/java/org/jivesoftware/smack/util/XmlStringBuilder.java
	smack-core/src/test/java/org/jivesoftware/smack/ThreadedDummyConnection.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/address/provider/MultipleAddressesProvider.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/DataListener.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FaultTolerantNegotiator.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/IBBTransferNegotiator.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/Socks5TransferNegotiator.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/StreamNegotiator.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/LeafNode.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Node.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubManager.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/packet/PubSub.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/VCardManager.java
	smack-extensions/src/test/java/org/jivesoftware/smackx/receipts/DeliveryReceiptTest.java
	smack-im/src/main/java/org/jivesoftware/smack/chat/ChatManager.java
	smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSession.java
	smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleProvider.java
	smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/UserID.java
	smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/provider/RosterExchangeProvider.java
	smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java
	version.gradle
 2015-03-04 22:42:36 +01:00
Florian Schmaus ed4fa3390f Add XMPPConnection.sendStanza(Stanza) 
and deprecate sendPacket().
 2015-03-04 21:46:44 +01:00
Florian Schmaus 85a9b07230 Fix MUC participantStatusListeners 
Thanks to Anno van Vliet for reporting the issue and proposing the fix.
 2015-03-03 17:11:42 +01:00
Florian Schmaus 75ec271c6c Rename PacketListener to StanzaListener 
and add the PacketListener as deprecated interface.
 2015-03-02 15:49:56 +01:00
Florian Schmaus d4a6d8e653 Rename PacketFilter (and implementing classes) and PacketExtension 
to StanzaFilter and ExtensionElement.
 2015-02-28 13:49:38 +01:00
Florian Schmaus 5bb4727c57 Use Jid (and subclasses) from jxmpp-jid 
Fixes SMACK-634
 2015-02-17 16:07:16 +01:00
Florian Schmaus bc61527bd2 Expose InterruptedException 
SMACK-632
 2015-02-14 14:57:33 +01:00
Florian Schmaus 4698805a34 Rename 'Packet' class to 'Stanza' 
Smack still uses the term 'Packet' in some places. This is just the
first step towards using correct XMPP terms in Smack.
 2015-02-06 09:34:51 +01:00
Florian Schmaus 86ea027301 Add StringUtils.requireNotNullOrEmpty and Objects.requireNonNull 
and use this in a few places.
 2015-01-26 20:47:09 +01:00
Florian Schmaus d5b8647d9d Create smack-im subproject for XMPP-IM 
Move Roster and Chat(Manager) code into their own packages within the
new smack-im subproject.

Apply Manager pattern to Roster.

Fixes SMACK-637.
 2015-01-26 07:54:05 +01:00
Florian Schmaus 6bf9498904 Add note about getMultiUserChat in MUC's javadoc 2015-01-19 08:38:11 +01:00
Florian Schmaus eb6b8df7c5 Add MultiUserChat.requestVoice() 2015-01-13 13:31:45 +01:00
Florian Schmaus 717090d272 Rework incoming packet listeners and Roster 
Differentiate between asynchronous and synchronous ones. Asynchronous
are the ones where the invocation order may not be the same as the order
in which the stanzas arrived.

Since it's no longer guaranteed that when a unit test calls

processPacket(stanza)

the stanza will be completely processed when the call returns, it was
necessary to extend the unit tests (mostly Roster and ChatManager) with
a packet listener that waits for his invocation. Since we now also use
LinkedHashMaps as Map for the packet listeners (SMACK-531, SMACK-424),
adding a packet listeners as last also means that it will be called as
last. We exploit this behavior change now in the unit tests.

Rename 'recvListeners' to 'syncRecvListeners' in AbstractXMPPConnection.

Rename 'rosterInitialized' to 'loaded' in Roster.

Add Roster.isLoaded().

Reset 'loaded' to false in
Roster.setOfflinePresencesAndResetLoaded() (was setOfflinePresences()).

Fixes SMACK-583, SMACK-532, SMACK-424
 2015-01-07 14:35:23 +01:00
Florian Schmaus 1f38e4ca0d Use new XmlStringBuilder.append(Collection<? extends Element>) in MUCUser 2015-01-02 00:14:04 +01:00
Florian Schmaus f029b576a5 Add XMPPConnection.addAsyncPacketListener(PacketListener, PacketFilter) 
and use this method in packet listeners that previously used Async.go().
 2014-12-30 20:45:17 +01:00
Florian Schmaus ecc13e2e91 Invoke MUC invitation listener async 
Basically the same fix as 191c4429da was
for file transfer listeners, just for MUC invitation listeners.
 2014-12-30 20:04:29 +01:00
Florian Schmaus e6593cb200 Use createMessage() where possible in MultiUserChat 2014-12-30 12:13:58 +01:00