477 commits

Author	SHA1	Message	Date
vanitasvitae	8bd3856fa1	Fix typos in filetransfer package	2017-07-06 14:01:28 +02:00
vanitasvitae	99c1c93c2a	Fix shouldPreserveAddressOrderOnInsertions test ... The test failed because the ArrayList - in contrast to the underlying Set - did not check for duplicates on insert. Under certain circumstances this lead to an index out of bounds exception because the list in the test contained duplicated entries which were not present in the set of the Socks5Proxy. I fixed the issue by only inserting the address when it was not in the list before.	2017-07-04 21:50:08 +02:00
vanitasvitae	7e76bc1ae5	More changes to the Jingle package: ... - Change visibility of some Socks5Bytestreams code. - Add central ThreadPool - Move FullJidAndSessionId in own class - More complete JingleSession class - More complete JingleUtil class - Improved tests	2017-07-03 10:35:46 +02:00
vanitasvitae	5bd01b7385	Add Jingle File Transfer elements and JingleUtil class	2017-06-30 15:03:13 +02:00
Florian Schmaus	541c9ecfdd	Fix compile errors in jingle code ... Which where introduced by merging 20eabca1b3 after b14aca744f	2017-06-29 18:09:25 +02:00
Florian Schmaus	1d53889874	Merge pull request #145 from vanitasvitae/singleJingleTransport ... Switch to single transport instead of list	2017-06-28 21:02:52 +02:00
vanitasvitae	20eabca1b3	Also replace list with single transport-info info	2017-06-26 15:04:22 +02:00
vanitasvitae	e2b8ffdf22	Switch to single transport instead of list	2017-06-21 13:42:02 +02:00
vanitasvitae	b14aca744f	Add Jingle SOCKS5Bytestream transport method	2017-06-19 10:11:08 +02:00
Florian Schmaus	08a4ee4eb2	Reworked some Jingle unit tests to use Junit's "expected=" ... Also don't use randomString() because then the unit tests also depend on the correct behavior of it.	2017-06-17 16:08:32 +02:00
Florian Schmaus	2b11074950	Merge branch '4.2'	2017-06-17 15:55:38 +02:00
Florian Schmaus	05148ab0ad	Merge pull request #142 from vanitasvitae/jingleIBB ... Add Jingle InBandBytestream transports	2017-06-16 23:32:59 +02:00
Florian Schmaus	aaad697b02	Merge pull request #140 from vanitasvitae/TransportInfo ... Add JingleContentTransportInfo class	2017-06-16 23:25:23 +02:00
Florian Schmaus	6712cc91c8	Merge pull request #139 from vanitasvitae/JingleErrors ... Remove unused errors and add missing ones	2017-06-16 23:19:50 +02:00
vanitasvitae	5699373cd9	Add method to set Reason	2017-06-16 22:54:32 +02:00
Florian Schmaus	759a7d7a70	Fix InitationListenerTest's timeouts ... Don't use Thread.sleep(), isntead we use Mockito's timeout() method.	2017-06-16 22:51:14 +02:00
vanitasvitae	287976e0e0	Add Jingle InBandBytestream transports	2017-06-16 22:43:50 +02:00
Florian Schmaus	08e897113d	Add CustomImportOrder checkstyle rule ... And matching ImportOrder settings for Eclipse in resources/eclipse/smack.importorder	2017-06-14 17:12:43 +02:00
vanitasvitae	e33bb5a741	Reorder imports	2017-06-14 00:01:05 +02:00
vanitasvitae	a604266336	Create alternative-session JingleReason	2017-06-14 00:00:27 +02:00
vanitasvitae	62167a7857	Reorder imports	2017-06-13 23:58:41 +02:00
vanitasvitae	4ae8434852	Remove unused errors and add missing ones	2017-06-13 23:57:59 +02:00
vanitasvitae	d49dc71bae	Add JingleContentTransportInfo class	2017-06-08 15:04:25 +02:00
Florian Schmaus	acc98b4b2f	Merge pull request #137 from vanitasvitae/jingleTests ... Add tests for jingle classes	2017-06-05 19:06:29 +02:00
Florian Schmaus	349d1ba2ae	Merge pull request #136 from vanitasvitae/jingleManagerFixes ... Fix typos and xml issues in jingle package	2017-06-05 11:04:52 +02:00
vanitasvitae	23190604bd	Fix typos and xml issues	2017-06-04 20:41:27 +02:00
vanitasvitae	0a31161950	Add tests for jingle classes ... Depends on #135, #136	2017-06-03 23:46:29 +02:00
vanitasvitae	23ed0bdbce	Add missing security-info in JingleAction ... Also fix typo	2017-06-03 23:23:23 +02:00
Florian Schmaus	f5ef42ec56	Merge branch '4.2'	2017-06-02 13:51:56 +02:00
Florian Schmaus	ce36fb468c	Increase getSocket() timeout in Socks5ClientForInitiatorTest ... This will hopefully reduce the false negatives when running the unit tests with Travis CI.	2017-06-02 12:03:46 +02:00
Florian Schmaus	6bb001d274	New Jingle API groundwork ... A start for the new Jingle API. Since Jingle is a single IQ with many plugable extensions, there are some particularities we need to deal with, e.g. jingle users have to register with JingleManager. This is untested code. There may be drangons.	2017-05-30 08:45:27 +02:00
Florian Schmaus	7a5f9e6a03	Merge branch '4.2'	2017-05-25 11:25:36 +02:00
Florian Schmaus	ce1cddc722	More checkstyle whitespace related checks	2017-05-24 14:42:38 +02:00
Alexander Tovstonozhenko	b636883ce6	Fix NPE in hashCode() in Occupant when jid is null ... Fixes SMACK-764.	2017-05-19 14:09:19 +03:00
Florian Schmaus	5f900d3713	Add PingManager.pingAsync(Jid, long) ... and SmackFuture API.	2017-05-16 15:53:03 +02:00
Florian Schmaus	5aab471d64	Improve handling of error response "Pongs"	2017-05-16 15:53:03 +02:00
Florian Schmaus	48b5dc5fe7	Conditionially set the IQ type in ThreadedDummyConnection ... and do not set 'from'.	2017-05-16 15:53:03 +02:00
Florian Schmaus	24f6d86452	Fix typo: s/ProsoydWorkaround/ProsodyWorkaround/	2017-04-19 12:23:17 +02:00
Florian Schmaus	ddf888e607	Do not return null in getLeafNodeProsodyWorkaround ... and rethrow the original exception.	2017-04-19 12:21:04 +02:00
Florian Schmaus	bfab3ec578	PubSubManager.getLeafNode(): Actually employ the prosody workaround	2017-04-19 11:50:01 +02:00
Florian Schmaus	e6a51f2151	Add PubSubManager.getLeafNode() and improve prosody workaround ... by using the protected constructor and not reflection.	2017-04-19 11:46:39 +02:00
vanitasvitae	10927577ad	Fix getOrCreateLeafNode for prosody	2017-04-19 11:34:47 +02:00
Florian Schmaus	c636e72a9d	Change behavior of send()/publish() in LeafNode ... Previously publish() was "asynchronously" in that sense that the response of the IQ as *not* awaited, and send() would wait for the responses. It makes no sense to have that functionality this way. Instead we now make publish() to the right thing, i.e., wait for an IQ result, make send() a proxy for publish(), and mark send() deprecated. In the future, there may be a publishAsync() method which returns a Future instance.	2017-04-06 15:11:04 +02:00
Florian Schmaus	16ede9806a	Add PubSubManaer.supportsAutomaticNodeCreation()	2017-04-06 12:32:34 +02:00
Florian Schmaus	e73cef8000	Add PubSubManager.tryToPublishAndPossibleAutoCreate(String, I)	2017-04-06 10:14:54 +02:00
Florian Schmaus	8466a5af1a	Improve MUCs subject changed notification filter ... Filter also messages with bodies or thread element.	2017-04-04 14:27:11 +02:00
Florian Schmaus	a887cde1ce	Allow MUC room subject changes from the MUCs bare JID ... Fixes SMACK-754.	2017-04-04 14:08:19 +02:00
Florian Schmaus	08c228ef99	Merge branch '4.2'	2017-03-20 14:57:42 +01:00
Florian Schmaus	1e0481b355	Add PubSubManager.getOrCreateLeafNode(String)	2017-03-18 18:31:06 +01:00
Florian Schmaus	0a6843f41f	Make StreamNegotiator weakly reference XMPPConnection ... by extending Manager. Because FileTransferNegotiator will hold a strong reference to the StreamNegotiators, which will eventually prevent XMPPConnection from being GC'ed if no weak references in StreamNegotiator are used. Thanks to Werner Glanzer for pointing this out.	2017-03-15 21:17:49 +01:00