1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-11-16 01:02:06 +01:00
Commit graph

184 commits

Author SHA1 Message Date
4b8ac5a1ab
More Jingle IBB tests 2017-08-09 19:44:31 +02:00
efaa3c27a9
More Jingle IBB tests 2017-08-09 19:26:33 +02:00
901d7b39c5
Test isReceiving, isSending 2017-08-09 18:36:54 +02:00
f930c1bdc5
Rename getSid -> getSession/StreamId
add junit tests for JingleSession
2017-08-09 16:45:35 +02:00
9712dc1df7
Merge flowdalic/master 2017-08-05 18:22:07 +02:00
066d366dd5
fix checkstyle issues 2017-08-05 14:44:59 +02:00
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
9c71cb8aeb
Add tests 2017-08-05 00:43:54 +02:00
d2f979ed15
JET is close to working 2017-07-31 12:08:18 +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
fec28ac7b6
Fix checkstyle issues 2017-07-27 23:31:04 +02:00
3ed3f53189
Remove errors 2017-07-27 17:35:16 +02:00
980c324f27
Some refactoring 2017-07-27 15:18:18 +02:00
e28bfa1a64
Complete JingleElement and fix jingle tests 2017-07-21 23:51:06 +02:00
639c951fd6
Nearly completed work on Jingle SOCKS5 2017-07-21 23:05:46 +02:00
f4a910cfa5
Reworking transports WIP 2017-07-19 23:15:17 +02:00
6818a52da7
Heavy reworking in progress 2017-07-19 15:17:12 +02:00
b8a044fc33
Fix checkstyle issues 2017-07-12 19:22:48 +02:00
9827bb4f11
Two more tests 2017-07-12 15:47:39 +02:00
e2d2f67982
Small bugfix and session-initiate test 2017-07-12 14:46:00 +02:00
e11a4ea9c5
Add comments and more tests 2017-07-11 22:30:41 +02:00
f9086439a8
Use handler to notify on finished file transfer 2017-07-10 12:46:51 +02:00
63d71230cc
More tests 2017-07-08 00:23:18 +02:00
e271532804
More tests 2017-07-06 17:44:02 +02:00
bbaa367dfb
Better test 2017-07-06 16:54:21 +02:00
a3bb7e3f59
Merge master 2017-07-05 13:00:21 +02:00
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
55d41e3390
More tests 2017-07-03 15:22:34 +02:00
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
71486ab68e
Merge moreJingleTests 2017-06-30 18:56:56 +02:00
322587c0b5
More jingle related tests 2017-06-30 18:49:34 +02:00
ff899d05e7
Merge js5btbFixes 2017-06-30 16:33:27 +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
69b3f5837e
Rewrote S5BTransportSession 2017-06-26 18:05:17 +02:00
136af25342
Add JingleTransportSession classes 2017-06-23 22:48:28 +02:00
ab82a58e0f Merge branch 'fixProxyTest' into jingle2 2017-06-23 13:01:50 +02:00
847a39b6ab
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-06-23 12:51:07 +02:00
9da555f57e Merge branch 'singleJingleTransport' into jingle2 2017-06-21 13:44:27 +02:00
e2b8ffdf22
Switch to single transport instead of list 2017-06-21 13:42:02 +02:00
2bac6297ee
Split JingleFileTransferSession in incoming and outgoing 2017-06-19 17:55:04 +02:00
b14aca744f
Add Jingle SOCKS5Bytestream transport method 2017-06-19 10:11:08 +02:00
b91a9c120f
More ground work 2017-06-18 16:47:49 +02:00
d34539126b
Fix import order 2017-06-18 11:52:56 +02:00
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
2ee10fa83b Merge branch 'JingleErrors' into jingle2 2017-06-17 00:04:13 +02:00
Florian Schmaus
05148ab0ad Merge pull request #142 from vanitasvitae/jingleIBB
Add Jingle InBandBytestream transports
2017-06-16 23:32:59 +02:00