562 commits

Author	SHA1	Message	Date
vanitasvitae	a101de29fd	JIBB works	2017-06-24 12:14:05 +02:00
vanitasvitae	c4ef2c9552	Temp	2017-06-23 23:41:40 +02:00
vanitasvitae	136af25342	Add JingleTransportSession classes	2017-06-23 22:48:28 +02:00
vanitasvitae	ab82a58e0f	Merge branch 'fixProxyTest' into jingle2	2017-06-23 13:01:50 +02:00
vanitasvitae	847a39b6ab	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-06-23 12:51:07 +02:00
vanitasvitae	cb3583e510	IBB sending works using worker thread	2017-06-22 14:47:39 +02:00
vanitasvitae	5dc37ab239	Fixed some sending issues	2017-06-21 18:03:31 +02:00
vanitasvitae	ecd29a1ea8	s5b createTransport	2017-06-21 15:42:00 +02:00
vanitasvitae	4c1ee37ea7	Reuse S5B methods	2017-06-21 15:28:32 +02:00
vanitasvitae	6023350364	Progress	2017-06-21 14:11:42 +02:00
vanitasvitae	9da555f57e	Merge branch 'singleJingleTransport' into jingle2	2017-06-21 13:44:27 +02:00
vanitasvitae	e2b8ffdf22	Switch to single transport instead of list	2017-06-21 13:42:02 +02:00
vanitasvitae	16a7f31a46	Add sendingThread	2017-06-21 00:16:47 +02:00
vanitasvitae	96197d4092	Add transport replace actions	2017-06-19 19:22:59 +02:00
vanitasvitae	2bac6297ee	Split JingleFileTransferSession in incoming and outgoing	2017-06-19 17:55:04 +02:00
vanitasvitae	73f9af474e	Send session-accept/decline	2017-06-19 15:26:10 +02:00
vanitasvitae	e0a54c19d6	First state representing stuff	2017-06-19 14:44:35 +02:00
vanitasvitae	1912ebb8d0	Join JingleSession and Handler in JingleFT	2017-06-19 10:47:24 +02:00
vanitasvitae	b14aca744f	Add Jingle SOCKS5Bytestream transport method	2017-06-19 10:11:08 +02:00
vanitasvitae	b91a9c120f	More ground work	2017-06-18 16:47:49 +02:00
vanitasvitae	dcb5da76d6	Merge branch 'jingleFTElements' into jingle2	2017-06-18 14:12:04 +02:00
vanitasvitae	e5502564b1	Add more errors	2017-06-18 14:11:37 +02:00
vanitasvitae	49868ecdaf	Merge branch 'jingleFTElements' into jingle2	2017-06-18 13:08:56 +02:00
vanitasvitae	d3af7cd9c1	Add creating methods to JingleUtil	2017-06-18 13:08:09 +02:00
vanitasvitae	d0701f8fd1	Merge branch 'jingleS5B' into jingle2	2017-06-18 12:32:08 +02:00
vanitasvitae	21435a72c5	Reorder imports	2017-06-18 12:29:44 +02:00
vanitasvitae	20e6580469	Merge remote-tracking branch 'upstream/master' into jingleFTElements	2017-06-18 12:11:17 +02:00
vanitasvitae	3c4441af4f	Reorder imports	2017-06-18 12:08:47 +02:00
vanitasvitae	93a363377e	Merge remote-tracking branch 'upstream/master' into jingleS5B	2017-06-18 12:05:15 +02:00
vanitasvitae	d34539126b	Fix import order	2017-06-18 11:52:56 +02:00
vanitasvitae	1e6b9b8257	Merge remote-tracking branch 'upstream/master' into jingle2	2017-06-18 11:28:39 +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
vanitasvitae	2f3de3a64d	Add Jingle File Transfer elements and JingleUtil class	2017-06-17 00:56:32 +02:00
vanitasvitae	6cb23d08e0	Add Jingle File Transfer elems and providers	2017-06-17 00:40:51 +02:00
vanitasvitae	46b352ef88	Add JingleFileTransfer class	2017-06-17 00:26:44 +02:00
vanitasvitae	f783ecab4b	Move ft to experimental, more jingleUtil stuff	2017-06-17 00:17:21 +02:00
vanitasvitae	2ee10fa83b	Merge branch 'JingleErrors' into jingle2	2017-06-17 00:04:13 +02:00
vanitasvitae	f80472e082	Fix reviewed points	2017-06-16 23:45:00 +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	b3cec53cc5	Merge branch 'jingleS5B' into jingle2	2017-06-16 22:46:15 +02:00
vanitasvitae	0bc62e3cd9	Merge	2017-06-16 22:46:07 +02:00
vanitasvitae	287976e0e0	Add Jingle InBandBytestream transports	2017-06-16 22:43:50 +02:00
vanitasvitae	8488831ddc	Add Jingle SOCKS5Bytestream transport	2017-06-16 22:14:42 +02:00
vanitasvitae	d1e0a4683f	Merge branch 'jingleIBB' into jingle2	2017-06-16 21:55:50 +02:00
vanitasvitae	6b472d0ccd	Add JingleUtil	2017-06-16 21:55:42 +02:00
vanitasvitae	3c6ca94cb4	Add Jingle InBandBytestream transports	2017-06-16 21:52:20 +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
Florian Schmaus	a592a12229	Make InBandBytestreamManager use weak references to XMPPConnection	2017-03-15 15:07:41 +01:00
Florian Schmaus	1a93b448db	Smack 4.2.0 ... -----BEGIN PGP SIGNATURE----- iQGTBAABCgB9FiEEl3UFnzoh3OFr5PuuIjmn6PWFIFIFAljDKBtfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDk3 NzUwNTlGM0EyMURDRTE2QkU0RkJBRTIyMzlBN0U4RjU4NTIwNTIACgkQIjmn6PWF IFJB7Qf6AlkwpzMqq1g18jzEBFVX/3Sk2QWivEY7t3EhGuSguan2VIfd1fL0P85Q vLBm6Pw93haIxHXKRUKc8DINwP9yuRMvUotCN2hYVgfqfByHGhDCJLTNZ9atncL5 JToptfhdRy6kgljVZPtpXOMXKBvaO3QOuTuC5cmz8PlidsYw0yUnliPLQ36uPRWX eaEXXbgmkjJh35WjsaafD/uM86OCqZahfvEf3e8bkPzdAayd0OKU67+v0ArA9P2E CiRU5vfco/vt2Qo41aLLIEOjSFfVX6Xh/pXxfQvInMAxies0KRLi5vonOmfrWRmi uIblzcYRXCSaZSgVN2yF8KzmF4pzcw== =qETn -----END PGP SIGNATURE----- Merge tag '4.2.0' Smack 4.2.0	2017-03-10 23:35:06 +01:00
Florian Schmaus	c81f28a3a2	Update Error Prone to 2.0.18 ... and update errorprone-plugin to 0.0.9.	2017-03-07 11:00:47 +01:00
Florian Schmaus	68cecf2eee	Fix the MUC join presence response filter ... Error responses do not contain the '110' status. Therefore we have to filter for them via the stanza id and the from address.	2017-02-20 14:22:19 +01:00
Florian Schmaus	6cfdf2bc6f	Use CopyOnWriteArraySet for pingFailedListeners ... To prevent java.util.ConcurrentModificationException at java.util.HashMap$HashIterator.nextEntry(HashMap.java:788) at java.util.HashMap$KeyIterator.next(HashMap.java:815) at org.jivesoftware.smackx.ping.PingManager.pingMyServer(PingManager.java:252) at org.kontalk.service.msgcenter.MessageCenterService$3.run(MessageCenterService.java:1114) at java.lang.Thread.run(Thread.java:818) Thanks to Daniele Ricci for reporting this.	2017-02-15 20:16:40 +01:00
Florian Schmaus	ca54f65b3e	Merge branch '4.2'	2017-02-11 21:02:20 +01:00
Florian Schmaus	4c646436a5	Bump "Error Prone" to 2.0.15 ... and fix a few things :)	2017-02-11 16:16:41 +01:00
Florian Schmaus	ef0af66b21	Enfore spaces for indentation ... Although I'm in the tabs camp, Smack uses mostly spaces. Therefore it is the logical choice for the indentation style.	2017-02-07 22:10:10 +01:00
Florian Schmaus	bf1e07e672	Fix chat2.ChatManager's message filter ... Thanks to Andras Csete for pointing this out.	2017-02-02 12:46:50 +01:00
Florian Schmaus	187fe37cd7	Fix MucEnterConfiguration.Builder.withPresence(Presence) throw ISE ... when presence is of type available. This inverts the logic to fix this.	2017-01-30 17:09:29 +01:00
Florian Schmaus	5d0dd49e61	Introduce ToMatchesFilter ... and refactor the FromMatchesFilter into AbstractFromToMatchesFilter.	2017-01-29 11:08:16 +01:00
Florian Schmaus	33371cffaf	Move ChatStateExtension Provider in its own class	2017-01-23 22:59:53 +01:00
Florian Schmaus	af1bde4fd0	Make MUC invitations 'from' value an EntityJid ... instead of an EntityFullJid, because according to XEP-0045 § 7.8.1.: "The <room@service> itself MUST then add a 'from' address to the <invite/> element whose value is the bare JID, full JID, or occupant JID of the inviter …"	2017-01-20 17:06:06 +01:00
Florian Schmaus	4d7b9318ce	Add callbacks for block/unblock events to BlockingCommandManager	2017-01-20 08:57:03 +01:00
Florian Schmaus	ff97d2eb35	Make BlockContactsIQProvider idiomatic ... The jids list doesn't have to be lazy initialized, because every IQ of that type is guaranteed to contain at least one JID. Also use ParserUtils.getJidAttribute().	2017-01-20 08:56:56 +01:00
Florian Schmaus	b3662c0682	Make UnblockContactsIQ immutable ... and make the serialization function idiomatic.	2017-01-20 08:56:50 +01:00