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

509 commits

Author SHA1 Message Date
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
f3244f507e Merge branch 'fixReason' into jingle2 2017-07-06 16:57:36 +02:00
58c32639b5
Allow parsing of JingleReason.AlternativeSession
The JingleReasonProvider was faulty and ignored the
<alternative-session> element.
2017-07-06 16:55:12 +02:00
a11552eb63 Merge branch 'filetransferTypos' into jingle2 2017-07-06 14:15:33 +02:00
8bd3856fa1
Fix typos in filetransfer package 2017-07-06 14:01:28 +02:00
87949f94b9
Temp 2017-07-06 14:00:36 +02:00
a3bb7e3f59
Merge master 2017-07-05 13:00:21 +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
4a8251fbe5
Transport Fallback works, but does not save file 2017-07-02 21:25:50 +02:00
f26f3bb503
Use static threadPool and start working on async file transfer method 2017-07-02 15:42:16 +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
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
dec275aa4d
Add methods to enable/disable proxy types 2017-06-30 15:19:36 +02:00
5bd01b7385
Add Jingle File Transfer elements and JingleUtil class 2017-06-30 15:03:13 +02:00
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
a395b11ee9
S5B Works now in both directions and with external proxy 2017-06-28 14:48:39 +02:00
d537463a42
SOCKS5 works again :) 2017-06-28 11:40:27 +02:00
9d6a858b23
So close... 2017-06-26 23:18:34 +02:00
69b3f5837e
Rewrote S5BTransportSession 2017-06-26 18:05:17 +02:00
5eba48b7d8 Merge branch 'singleJingleTransport' into jingle2 2017-06-26 15:05:40 +02:00
20eabca1b3
Also replace list with single transport-info info 2017-06-26 15:04:22 +02:00
0952c20a5c
Coming closer... 2017-06-25 23:19:35 +02:00
daa6b6b999
Some bugfixes 2017-06-25 22:18:19 +02:00
04e898083c
Much progress, such wow 2017-06-25 16:59:09 +02:00
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
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