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

591 commits

Author SHA1 Message Date
vanitasvitae
a3bb7e3f59
Merge master 2017-07-05 13:00:21 +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
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
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
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
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
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
ecd29a1ea8
s5b createTransport 2017-06-21 15:42:00 +02:00
vanitasvitae
4c1ee37ea7
Reuse S5B methods 2017-06-21 15:28:32 +02:00
vanitasvitae
6023350364
Progress 2017-06-21 14:11:42 +02:00
vanitasvitae
9da555f57e Merge branch 'singleJingleTransport' into jingle2 2017-06-21 13:44:27 +02:00
vanitasvitae
e2b8ffdf22
Switch to single transport instead of list 2017-06-21 13:42:02 +02:00
vanitasvitae
16a7f31a46
Add sendingThread 2017-06-21 00:16:47 +02:00
vanitasvitae
96197d4092
Add transport replace actions 2017-06-19 19:22:59 +02:00
vanitasvitae
2bac6297ee
Split JingleFileTransferSession in incoming and outgoing 2017-06-19 17:55:04 +02:00
vanitasvitae
73f9af474e
Send session-accept/decline 2017-06-19 15:26:10 +02:00
vanitasvitae
e0a54c19d6
First state representing stuff 2017-06-19 14:44:35 +02:00
vanitasvitae
1912ebb8d0
Join JingleSession and Handler in JingleFT 2017-06-19 10:47:24 +02:00
vanitasvitae
b14aca744f
Add Jingle SOCKS5Bytestream transport method 2017-06-19 10:11:08 +02:00
vanitasvitae
b91a9c120f
More ground work 2017-06-18 16:47:49 +02:00
vanitasvitae
dcb5da76d6 Merge branch 'jingleFTElements' into jingle2 2017-06-18 14:12:04 +02:00
vanitasvitae
e5502564b1
Add more errors 2017-06-18 14:11:37 +02:00
vanitasvitae
49868ecdaf Merge branch 'jingleFTElements' into jingle2 2017-06-18 13:08:56 +02:00
vanitasvitae
d3af7cd9c1
Add creating methods to JingleUtil 2017-06-18 13:08:09 +02:00
vanitasvitae
d0701f8fd1 Merge branch 'jingleS5B' into jingle2 2017-06-18 12:32:08 +02:00
vanitasvitae
21435a72c5
Reorder imports 2017-06-18 12:29:44 +02:00
vanitasvitae
20e6580469 Merge remote-tracking branch 'upstream/master' into jingleFTElements 2017-06-18 12:11:17 +02:00
vanitasvitae
3c4441af4f
Reorder imports 2017-06-18 12:08:47 +02:00
vanitasvitae
93a363377e Merge remote-tracking branch 'upstream/master' into jingleS5B 2017-06-18 12:05:15 +02:00
vanitasvitae
d34539126b
Fix import order 2017-06-18 11:52:56 +02:00
vanitasvitae
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
vanitasvitae
2f3de3a64d
Add Jingle File Transfer elements and JingleUtil class 2017-06-17 00:56:32 +02:00
vanitasvitae
6cb23d08e0
Add Jingle File Transfer elems and providers 2017-06-17 00:40:51 +02:00
vanitasvitae
46b352ef88
Add JingleFileTransfer class 2017-06-17 00:26:44 +02:00
vanitasvitae
f783ecab4b
Move ft to experimental, more jingleUtil stuff 2017-06-17 00:17:21 +02:00
vanitasvitae
2ee10fa83b Merge branch 'JingleErrors' into jingle2 2017-06-17 00:04:13 +02:00
vanitasvitae
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
vanitasvitae
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
vanitasvitae
b3cec53cc5 Merge branch 'jingleS5B' into jingle2 2017-06-16 22:46:15 +02:00
vanitasvitae
0bc62e3cd9
Merge 2017-06-16 22:46:07 +02:00
vanitasvitae
287976e0e0
Add Jingle InBandBytestream transports 2017-06-16 22:43:50 +02:00
vanitasvitae
8488831ddc
Add Jingle SOCKS5Bytestream transport 2017-06-16 22:14:42 +02:00
vanitasvitae
d1e0a4683f Merge branch 'jingleIBB' into jingle2 2017-06-16 21:55:50 +02:00
vanitasvitae
6b472d0ccd
Add JingleUtil 2017-06-16 21:55:42 +02:00
vanitasvitae
3c6ca94cb4
Add Jingle InBandBytestream transports 2017-06-16 21:52:20 +02:00
Florian Schmaus
08e897113d Add CustomImportOrder checkstyle rule 
And matching ImportOrder settings for Eclipse in
resources/eclipse/smack.importorder
 2017-06-14 17:12:43 +02:00
vanitasvitae
e33bb5a741
Reorder imports 2017-06-14 00:01:05 +02:00
vanitasvitae
a604266336
Create alternative-session JingleReason 2017-06-14 00:00:27 +02:00
vanitasvitae
62167a7857
Reorder imports 2017-06-13 23:58:41 +02:00
vanitasvitae
4ae8434852
Remove unused errors and add missing ones 2017-06-13 23:57:59 +02:00
vanitasvitae
d49dc71bae
Add JingleContentTransportInfo class 2017-06-08 15:04:25 +02:00
Florian Schmaus
acc98b4b2f Merge pull request #137 from vanitasvitae/jingleTests 
Add tests for jingle classes
 2017-06-05 19:06:29 +02:00
Florian Schmaus
349d1ba2ae Merge pull request #136 from vanitasvitae/jingleManagerFixes 
Fix typos and xml issues in jingle package
 2017-06-05 11:04:52 +02:00
vanitasvitae
23190604bd
Fix typos and xml issues 2017-06-04 20:41:27 +02:00
vanitasvitae
0a31161950
Add tests for jingle classes 
Depends on #135, #136
 2017-06-03 23:46:29 +02:00
vanitasvitae
23ed0bdbce
Add missing security-info in JingleAction 
Also fix typo
 2017-06-03 23:23:23 +02:00
Florian Schmaus
f5ef42ec56 Merge branch '4.2' 2017-06-02 13:51:56 +02:00
Florian Schmaus
ce36fb468c Increase getSocket() timeout in Socks5ClientForInitiatorTest 
This will hopefully reduce the false negatives when running the unit
tests with Travis CI.
 2017-06-02 12:03:46 +02:00
Florian Schmaus
6bb001d274 New Jingle API groundwork 
A start for the new Jingle API. Since Jingle is a single IQ with many
plugable extensions, there are some particularities we need to deal
with, e.g. jingle users have to register with JingleManager.

This is untested code. There may be drangons.
 2017-05-30 08:45:27 +02:00
Florian Schmaus
7a5f9e6a03 Merge branch '4.2' 2017-05-25 11:25:36 +02:00
Florian Schmaus
ce1cddc722 More checkstyle whitespace related checks 2017-05-24 14:42:38 +02:00
Alexander Tovstonozhenko
b636883ce6 Fix NPE in hashCode() in Occupant when jid is null 
Fixes SMACK-764.
 2017-05-19 14:09:19 +03:00
Florian Schmaus
5f900d3713 Add PingManager.pingAsync(Jid, long) 
and SmackFuture API.
 2017-05-16 15:53:03 +02:00
Florian Schmaus
5aab471d64 Improve handling of error response "Pongs" 2017-05-16 15:53:03 +02:00
Florian Schmaus
48b5dc5fe7 Conditionially set the IQ type in ThreadedDummyConnection 
and do not set 'from'.
 2017-05-16 15:53:03 +02:00