Commit Graph

149 Commits

Author SHA1 Message Date
vanitasvitae aeab6504a7
Merge upstream 2017-08-16 15:46:32 +02:00
vanitasvitae e1655aa344
Cleanup code 2017-08-16 15:36:49 +02:00
Florian Schmaus 80eaaf2d71 Fix warnings 2017-08-16 14:10:00 +02:00
vanitasvitae d7df408661
Add JingleContent tests 2017-08-15 00:11:00 +02:00
vanitasvitae 9ff0333032
Merge master 4.2.1 2017-08-14 22:15:23 +02:00
vanitasvitae 28674a4620
Refactoring 2017-08-13 19:44:02 +02:00
vanitasvitae 7744b244e8
Fix S5B test 2017-08-13 17:22:26 +02:00
vanitasvitae a9e80dc788
Fix errornous <activate> in s5b, calculate missing dst.addr 2017-08-13 14:38:38 +02:00
vanitasvitae 9fe247b1dc
JingleIBBAdapter test + getSid -> getStreamId (S5B) 2017-08-09 19:54:09 +02:00
vanitasvitae 4b8ac5a1ab
More Jingle IBB tests 2017-08-09 19:44:31 +02:00
vanitasvitae efaa3c27a9
More Jingle IBB tests 2017-08-09 19:26:33 +02:00
vanitasvitae 901d7b39c5
Test isReceiving, isSending 2017-08-09 18:36:54 +02:00
vanitasvitae f930c1bdc5
Rename getSid -> getSession/StreamId
add junit tests for JingleSession
2017-08-09 16:45:35 +02:00
vanitasvitae a23eb6aeea
Add UnknownSecurityElement
Fix parsing of JingleSecurityElements
Switch to 12 byte IV for AES keys
2017-08-09 10:45:34 +02:00
vanitasvitae 792a9a348b
FIX F%?§@N SOCKS5 2017-08-07 23:55:32 +02:00
vanitasvitae 034b7f3844
More feature-not-implemented and remove crap 2017-08-07 19:53:08 +02:00
vanitasvitae cac35d74b4
Check for disco support before file transfers 2017-08-07 14:35:00 +02:00
vanitasvitae 6fad0b9fab
Add Gajim fixes,
Return feature-not-implemented when suitable,
try next transport on transport-reject.
2017-08-07 11:36:40 +02:00
vanitasvitae 0d8b383b1c
Simplify content state handling, add Fallback test 2017-08-05 20:28:36 +02:00
vanitasvitae 9712dc1df7
Merge flowdalic/master 2017-08-05 18:22:07 +02:00
vanitasvitae 62587daa35
Merge master 2017-08-05 17:22:13 +02:00
vanitasvitae c4588eadc6
New JUnit tests and equals methods 2017-08-05 14:30:00 +02:00
Florian Schmaus 7f851d806c Use StandardExtensionElement in JingleProvider
and some further minor jingle fixes:
- deprecate getJingleTransport() in favor of getTransport()
- Jingle.Builder now checks if the session ID is not empty
2017-08-05 11:13:58 +02:00
vanitasvitae 9c71cb8aeb
Add tests 2017-08-05 00:43:54 +02:00
vanitasvitae 1aef1aaadc
Refactoring 2017-08-04 23:05:59 +02:00
vanitasvitae f0029a65ca
Rename methods for clarity 2017-08-04 22:48:33 +02:00
vanitasvitae cdcf0d590a
Add cleanup for transports, improve content states 2017-08-04 15:08:49 +02:00
vanitasvitae a07a1cdc61
Implement transport fallback 2017-08-04 14:06:12 +02:00
vanitasvitae 23eb34932f
SOCKS5 works (no external proxy) 2017-08-03 23:01:55 +02:00
vanitasvitae ff2f66fa67
Do not store peers proposal as transport 2017-08-03 15:11:34 +02:00
vanitasvitae aa8e8592af
JS5B test works 2017-08-02 20:52:52 +02:00
vanitasvitae 1c72fdfa14
More improvements to JS5B test (still fails) 2017-08-01 17:12:27 +02:00
vanitasvitae d2f979ed15
JET is close to working 2017-07-31 12:08:18 +02:00
vanitasvitae b0b46ad167
More progress on JET 2017-07-30 22:31:29 +02:00
Florian Schmaus ed9eae4793 Improve JingleS5BTransportInfo by introducing abstract class
Introduce a abstract class for shared functionality. And remove static
lazy getters.
2017-07-30 19:29:11 +02:00
vanitasvitae c82b25ea09
Work on Jingle Encrypted Transfers 2017-07-30 15:40:04 +02:00
vanitasvitae 1dbdafe28c
Basic Sending/Receiving Files works again 2017-07-29 22:21:36 +02:00
vanitasvitae af069ffc49
Pass events down to contents 2017-07-29 19:31:16 +02:00
vanitasvitae 185d569b89
Progress 2017-07-28 14:02:32 +02:00
vanitasvitae b0c8a8027a
Allow session-removal and use threads 2017-07-28 00:55:44 +02:00
vanitasvitae d37bdb5d20
Handle session-initiates in descriptionManager 2017-07-27 23:59:26 +02:00
vanitasvitae fec28ac7b6
Fix checkstyle issues 2017-07-27 23:31:04 +02:00
vanitasvitae 60cb777ea9
JingleIBBTransportTest works 2017-07-27 22:23:10 +02:00
vanitasvitae 68a03aeb48
IntegrationTest for JingleIBBTransport 2017-07-27 18:09:49 +02:00
vanitasvitae 3ed3f53189
Remove errors 2017-07-27 17:35:16 +02:00
vanitasvitae 3f6df8e6c7
Notifiers and ProgressListeners 2017-07-27 16:43:09 +02:00
vanitasvitae 5ce12974c8
Work on file transfer listeners 2017-07-27 15:58:11 +02:00
vanitasvitae 980c324f27
Some refactoring 2017-07-27 15:18:18 +02:00
vanitasvitae 3915a71824
Improve comparison of transportmanagers 2017-07-27 11:37:32 +02:00
vanitasvitae 4234e1d5ab
Anonymous progress 2017-07-27 00:12:42 +02:00