vanitasvitae
a3bb7e3f59
Merge master
2017-07-05 13:00:21 +02:00
vanitasvitae
55d41e3390
More tests
2017-07-03 15:22:34 +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
71486ab68e
Merge moreJingleTests
2017-06-30 18:56:56 +02:00
vanitasvitae
322587c0b5
More jingle related tests
2017-06-30 18:49:34 +02:00
vanitasvitae
ff899d05e7
Merge js5btbFixes
2017-06-30 16:33:27 +02:00
541c9ecfdd
Fix compile errors in jingle code
...
Which where introduced by merging
20eabca1b3b14aca744f
2017-06-29 18:09:25 +02:00
1d53889874
Merge pull request #145 from vanitasvitae/singleJingleTransport
...
Switch to single transport instead of list
2017-06-28 21:02:52 +02:00
vanitasvitae
69b3f5837e
Rewrote S5BTransportSession
2017-06-26 18:05:17 +02:00
vanitasvitae
136af25342
Add JingleTransportSession classes
2017-06-23 22:48:28 +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
2bac6297ee
Split JingleFileTransferSession in incoming and outgoing
2017-06-19 17:55:04 +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
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
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
2b11074950
Merge branch '4.2'
2017-06-17 15:55:38 +02:00
vanitasvitae
2ee10fa83b
Merge branch 'JingleErrors' into jingle2
2017-06-17 00:04:13 +02:00
05148ab0ad
Merge pull request #142 from vanitasvitae/jingleIBB
...
Add Jingle InBandBytestream transports
2017-06-16 23:32:59 +02:00
6712cc91c8
Merge pull request #139 from vanitasvitae/JingleErrors
...
Remove unused errors and add missing ones
2017-06-16 23:19:50 +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
3c6ca94cb4
Add Jingle InBandBytestream transports
2017-06-16 21:52:20 +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
0a31161950
Add tests for jingle classes
...
Depends on #135 , #136
2017-06-03 23:46:29 +02:00
vanitasvitae
Florian Schmaus