3139 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
vanitasvitae	8bd3856fa1	Fix typos in filetransfer package	2017-07-06 14:01:28 +02:00
Florian Schmaus	6775cf862d	Merge pull request #146 from vanitasvitae/fixProxyTest ... Fix shouldPreserveAddressOrderOnInsertions test	2017-07-05 08:33:12 +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
Florian Schmaus	12a8645864	Merge pull request #148 from vanitasvitae/js5btbFixes ... Enforce jingle s5b transport invariants.	2017-07-03 11:48:17 +02:00
Florian Schmaus	cd2d55944f	Merge pull request #144 from vanitasvitae/jingleFTElements ... Add Jingle File Transfer elements and JingleUtil class	2017-07-03 11:46:23 +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	bae840ebf7	Enforce jingle s5b transport invariants. ... There can only either be one info element or multiple candidates, but not both. Enforced this in the JingleS5BTransportBuilder	2017-06-30 15:36:02 +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
Florian Schmaus	9be94ca474	Merge pull request #143 from vanitasvitae/jingleS5B ... Add Jingle SOCKS5Bytestream transport	2017-06-28 21:00:15 +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	813219179f	Add support for <text/> elements in SM's <failed/> element ... Also introduce AbstractTextElement and StanzaErrorTextElement. Fixes SMACK-760.	2017-06-17 11:43:49 +02:00
Florian Schmaus	1448fa4632	Add ParserUtils.getXmlLang(XmlPullParser) ... and add TODO comment to PacketParserUtils.getLanguageAttribute().	2017-06-17 11:42:09 +02:00
Florian Schmaus	5424c9635f	Add XmlStringBuilder.optXmlLangAttribute(String)	2017-06-17 11:41:35 +02:00
Florian Schmaus	8038b7a3e1	Add TODO comment about renaming XMPPError to StanzaError	2017-06-17 11:41:07 +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	ddcc7aa568	Merge pull request #141 from vanitasvitae/HashManagerAdditions ... Add convenience methods to HashManager	2017-06-16 23:25:13 +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
Florian Schmaus	a33d596756	Merge pull request #138 from vanitasvitae/JingleReason ... Create alternative-session JingleReason	2017-06-16 23:19:14 +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	95d2cd75ec	Reorder imports	2017-06-13 23:54:47 +02:00
vanitasvitae	3ecd01135c	Add convenience methods to HashManager	2017-06-13 23:51:57 +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
Florian Schmaus	f7775bf053	Merge pull request #135 from vanitasvitae/securityInfo ... Add missing security-info in JingleAction	2017-06-04 10:12:20 +02:00
Florian Schmaus	55ae8193b7	Merge pull request #134 from vanitasvitae/hashes ... Add Use of Cryptographic Hashfunctions (XEP-300)	2017-06-04 10:11:59 +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
vanitasvitae	28f3130cf9	Add Use of Cryptographic Hashfunctions (XEP-300) ... Also move bouncycastle dep from smack-omemo to smack-experimental.	2017-06-03 00:33:56 +02:00
Florian Schmaus	f5ef42ec56	Merge branch '4.2'	2017-06-02 13:51:56 +02:00
vanitasvitae	e86700b040	Add OMEMO support ... This commit adds the modules smack-omemo and smack-omemo-signal. smack-omemo is licensed under the Apache license like the rest of the smack project. smack-omemo-signal on the other hand is licensed under the GPLv3. Due to the fact, that smack-omemo is not of much use without smack-omemo-signal, the OMEMO feature can currently only be used by GPLv3 compatible software. This may change in the future, when a more permissively licensed module becomes available. Fixes SMACK-743.	2017-06-02 13:40:10 +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	d9e6f6130b	Merge pull request #126 from vanitasvitae/fixReplBuildScript ... Update smack-repl gradle script	2017-05-31 09:28:50 +02:00
Florian Schmaus	f19a3a03ba	Merge pull request #132 from vanitasvitae/fixMamTest ... Make sure, archiving is activated	2017-05-31 09:28:26 +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