3165 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
vanitasvitae	4c7feeb11b	Receive in thread	2017-06-21 16:16:27 +02:00
vanitasvitae	6a4695b6c6	Receive file	2017-06-21 16:11:13 +02:00
vanitasvitae	7f04265bb9	Some improvements	2017-06-21 15:54:20 +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	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	781e809390	Merge jingleFTElements	2017-06-18 12:31:54 +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
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
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	fdd2ff960c	Merge remote-tracking branch 'upstream/master' into jingle2	2017-06-17 00:26:59 +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	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	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