vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-11-23 20:42:06 +01:00
Code Issues Releases Wiki Activity
3215 commits 61 branches 35 tags 39 MiB
Commit graph

3215 commits

This branch
This branch
All branches
Author SHA1 Message Date
vanitasvitae
5479938052
merge origin 2017-07-06 14:11:20 +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
vanitasvitae
9d6a858b23
So close... 2017-06-26 23:18:34 +02:00
vanitasvitae
69b3f5837e
Rewrote S5BTransportSession 2017-06-26 18:05:17 +02:00
vanitasvitae
5eba48b7d8 Merge branch 'singleJingleTransport' into jingle2 2017-06-26 15:05:40 +02:00
vanitasvitae
20eabca1b3
Also replace list with single transport-info info 2017-06-26 15:04:22 +02:00
vanitasvitae
0952c20a5c
Coming closer... 2017-06-25 23:19:35 +02:00
vanitasvitae
daa6b6b999
Some bugfixes 2017-06-25 22:18:19 +02:00
vanitasvitae
04e898083c
Much progress, such wow 2017-06-25 16:59:09 +02:00
vanitasvitae
d7cf19aca7
Add createCandidateUsed 2017-06-25 16:39:02 +02:00
vanitasvitae
a3d6562791
Even more progress 2017-06-25 16:28:59 +02:00
vanitasvitae
5ebd07ac3c
More progress 2017-06-25 15:13:56 +02:00
vanitasvitae
09548855dd
Progess 2017-06-25 14:25:17 +02:00
vanitasvitae
ad32393b61 Merge branch 'fixMUC' into jingle2 2017-06-25 12:32:57 +02:00
vanitasvitae
76e40e2682
Fix muc receiving 
The method OmemoManager.getSender() was faulty and returned null for MUC
occupants, which lead to NPEs when receiving MUC messages with OMEMO.
 2017-06-25 11:31:11 +02:00
vanitasvitae
699a19d3c2
Add S5B candidate accept/error 2017-06-24 17:46:03 +02:00
vanitasvitae
a101de29fd
JIBB works 2017-06-24 12:14:05 +02:00
vanitasvitae
c4ef2c9552
Temp 2017-06-23 23:41:40 +02:00
vanitasvitae
136af25342
Add JingleTransportSession classes 2017-06-23 22:48:28 +02:00
vanitasvitae
ab82a58e0f Merge branch 'fixProxyTest' into jingle2 2017-06-23 13:01:50 +02:00
vanitasvitae
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
vanitasvitae
cb3583e510
IBB sending works using worker thread 2017-06-22 14:47:39 +02:00
vanitasvitae
5dc37ab239
Fixed some sending issues 2017-06-21 18:03:31 +02:00
vanitasvitae
4f03cf9a24
Add send method 2017-06-21 17:34:34 +02:00
vanitasvitae
4649defe4f
Add license 2017-06-21 16:16:52 +02:00
vanitasvitae
4c7feeb11b
Receive in thread 2017-06-21 16:16:27 +02:00