Commit Graph

3239 Commits

Author SHA1 Message Date
vanitasvitae 59e79ef668
Temp 2017-07-14 21:19:03 +02:00
vanitasvitae 520f77112d
Documentation 2017-07-13 21:58:49 +02:00
vanitasvitae d61f9a511d
Rename package, make checkstyle smile 2017-07-13 21:45:04 +02:00
vanitasvitae 3c8542c85a
Add first JET classes 2017-07-13 21:36:37 +02:00
vanitasvitae 760571c3a0
Improved ChecksumTest 2017-07-13 15:45:12 +02:00
vanitasvitae 2364208bed
Fix faulty ChecksumProvider 2017-07-13 15:34:20 +02:00
vanitasvitae 0872f66bed
Activate failing test 2017-07-12 19:26:57 +02:00
vanitasvitae b8a044fc33
Fix checkstyle issues 2017-07-12 19:22:48 +02:00
vanitasvitae 7a55645317
Bug in CheckSumProvider? 2017-07-12 16:48:55 +02:00
vanitasvitae 9827bb4f11
Two more tests 2017-07-12 15:47:39 +02:00
vanitasvitae 1e26806e70
More tests 2017-07-12 15:25:52 +02:00
vanitasvitae e2d2f67982
Small bugfix and session-initiate test 2017-07-12 14:46:00 +02:00
vanitasvitae b08e03af8d
Add more javadoc 2017-07-12 10:39:51 +02:00
vanitasvitae e11a4ea9c5
Add comments and more tests 2017-07-11 22:30:41 +02:00
vanitasvitae ad529be705
Start implementing cancel abilities 2017-07-11 13:30:17 +02:00
vanitasvitae f9086439a8
Use handler to notify on finished file transfer 2017-07-10 12:46:51 +02:00
vanitasvitae 63d71230cc
More tests 2017-07-08 00:23:18 +02:00
vanitasvitae e271532804
More tests 2017-07-06 17:44:02 +02:00
vanitasvitae f3244f507e Merge branch 'fixReason' into jingle2 2017-07-06 16:57:36 +02:00
vanitasvitae 58c32639b5
Allow parsing of JingleReason.AlternativeSession
The JingleReasonProvider was faulty and ignored the
<alternative-session> element.
2017-07-06 16:55:12 +02:00
vanitasvitae bbaa367dfb
Better test 2017-07-06 16:54:21 +02:00
vanitasvitae 92117ec00b
Temp 2017-07-06 16:53:45 +02:00
vanitasvitae a11552eb63 Merge branch 'filetransferTypos' into jingle2 2017-07-06 14:15:33 +02:00
vanitasvitae 5479938052
merge origin 2017-07-06 14:11:20 +02:00
vanitasvitae 8bd3856fa1
Fix typos in filetransfer package 2017-07-06 14:01:28 +02:00
vanitasvitae 87949f94b9
Temp 2017-07-06 14:00:36 +02:00
vanitasvitae aae2c7304d
Add SendFileHandler 2017-07-06 00:10:04 +02:00
vanitasvitae a3bb7e3f59
Merge master 2017-07-05 13:00:21 +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
vanitasvitae 55d41e3390
More tests 2017-07-03 15:22:34 +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 63aa2f017c
Fallback works like a charm 2017-07-03 10:13:00 +02:00
vanitasvitae 4a8251fbe5
Transport Fallback works, but does not save file 2017-07-02 21:25:50 +02:00
vanitasvitae f26f3bb503
Use static threadPool and start working on async file transfer method 2017-07-02 15:42:16 +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
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 dec275aa4d
Add methods to enable/disable proxy types 2017-06-30 15:19:36 +02:00
vanitasvitae 5bd01b7385
Add Jingle File Transfer elements and JingleUtil class 2017-06-30 15:03:13 +02:00
vanitasvitae 59a600a0b6
progress 2017-06-29 21:53:57 +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 a395b11ee9
S5B Works now in both directions and with external proxy 2017-06-28 14:48:39 +02:00
vanitasvitae d537463a42
SOCKS5 works again :) 2017-06-28 11:40:27 +02:00
vanitasvitae 3058ebe8b9
Some debug output and small fixes 2017-06-27 20:27:38 +02:00