1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-11-04 19:25:58 +01:00
Commit graph

516 commits

Author SHA1 Message Date
d7cf19aca7
Add createCandidateUsed 2017-06-25 16:39:02 +02:00
a3d6562791
Even more progress 2017-06-25 16:28:59 +02:00
5ebd07ac3c
More progress 2017-06-25 15:13:56 +02:00
09548855dd
Progess 2017-06-25 14:25:17 +02:00
699a19d3c2
Add S5B candidate accept/error 2017-06-24 17:46:03 +02:00
a101de29fd
JIBB works 2017-06-24 12:14:05 +02:00
c4ef2c9552
Temp 2017-06-23 23:41:40 +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
cb3583e510
IBB sending works using worker thread 2017-06-22 14:47:39 +02:00
5dc37ab239
Fixed some sending issues 2017-06-21 18:03:31 +02:00
ecd29a1ea8
s5b createTransport 2017-06-21 15:42:00 +02:00
4c1ee37ea7
Reuse S5B methods 2017-06-21 15:28:32 +02:00
6023350364
Progress 2017-06-21 14:11:42 +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
16a7f31a46
Add sendingThread 2017-06-21 00:16:47 +02:00
96197d4092
Add transport replace actions 2017-06-19 19:22:59 +02:00
2bac6297ee
Split JingleFileTransferSession in incoming and outgoing 2017-06-19 17:55:04 +02:00
73f9af474e
Send session-accept/decline 2017-06-19 15:26:10 +02:00
e0a54c19d6
First state representing stuff 2017-06-19 14:44:35 +02:00
1912ebb8d0
Join JingleSession and Handler in JingleFT 2017-06-19 10:47:24 +02:00
b91a9c120f
More ground work 2017-06-18 16:47:49 +02:00
dcb5da76d6 Merge branch 'jingleFTElements' into jingle2 2017-06-18 14:12:04 +02:00
e5502564b1
Add more errors 2017-06-18 14:11:37 +02:00
49868ecdaf Merge branch 'jingleFTElements' into jingle2 2017-06-18 13:08:56 +02:00
d3af7cd9c1
Add creating methods to JingleUtil 2017-06-18 13:08:09 +02:00
d0701f8fd1 Merge branch 'jingleS5B' into jingle2 2017-06-18 12:32:08 +02:00
21435a72c5
Reorder imports 2017-06-18 12:29:44 +02:00
20e6580469 Merge remote-tracking branch 'upstream/master' into jingleFTElements 2017-06-18 12:11:17 +02:00
3c4441af4f
Reorder imports 2017-06-18 12:08:47 +02:00
93a363377e Merge remote-tracking branch 'upstream/master' into jingleS5B 2017-06-18 12:05:15 +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
2f3de3a64d
Add Jingle File Transfer elements and JingleUtil class 2017-06-17 00:56:32 +02:00
6cb23d08e0
Add Jingle File Transfer elems and providers 2017-06-17 00:40:51 +02:00
46b352ef88
Add JingleFileTransfer class 2017-06-17 00:26:44 +02:00
f783ecab4b
Move ft to experimental, more jingleUtil stuff 2017-06-17 00:17:21 +02:00
2ee10fa83b Merge branch 'JingleErrors' into jingle2 2017-06-17 00:04:13 +02:00
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
6712cc91c8 Merge pull request #139 from vanitasvitae/JingleErrors
Remove unused errors and add missing ones
2017-06-16 23:19:50 +02:00
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
b3cec53cc5 Merge branch 'jingleS5B' into jingle2 2017-06-16 22:46:15 +02:00
0bc62e3cd9
Merge 2017-06-16 22:46:07 +02:00