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
3371 commits 61 branches 35 tags 39 MiB
Commit graph

118 commits

Author SHA1 Message Date
vanitasvitae
63c2ef595f
Add support for XEP-0166, XEP-0260, XEP-0261 2017-08-16 21:53:29 +02:00
vanitasvitae
524660c870
Allow sending streams in JET 2017-08-16 19:58:43 +02:00
vanitasvitae
eb413f30b1
Refactor JET in order to match spec 2017-08-16 16:42:11 +02:00
vanitasvitae
e1655aa344
Cleanup code 2017-08-16 15:36:49 +02:00
vanitasvitae
e53165a96c
Improve JFT API 2017-08-15 17:43:06 +02:00
vanitasvitae
9ff0333032
Merge master 4.2.1 2017-08-14 22:15:23 +02:00
Florian Schmaus
43abd52d76 Smack 4.2.1 
-----BEGIN PGP SIGNATURE-----
 
 iQGTBAABCgB9FiEEl3UFnzoh3OFr5PuuIjmn6PWFIFIFAlmR75tfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDk3
 NzUwNTlGM0EyMURDRTE2QkU0RkJBRTIyMzlBN0U4RjU4NTIwNTIACgkQIjmn6PWF
 IFLeXggAjdgj7YVUe22NtamnROBj1c3PaWwgSY0gEjcyDPsOz5qeqNUdQLHbmt2j
 XQQpYZWKg1/1uoQHlsixaFKbGVctKRk72aNEodRfd1osta11WTOwZKEb8nI411Tt
 7M0Fhf430WZY6nioZiZIorsmid57fftJ2EMPlmjEDp2FD0AVGAXkEhCneGaPtt9Q
 hbWbepIy9tApeIH+QgmFLBmPLnFCaSg+X6NUden3Z21bUz5vH8pmcbeUVfsNB7kW
 nkkDuNwKHPFLgjuhcq7D+KAKRwNU7n8WEuHseRzM7bMCEB+S/rZok5KPXe/tV4v+
 YZKN2e+2yh4j5l4FT/fCzELfWcvrgA==
 =MV3G
 -----END PGP SIGNATURE-----

Merge tag '4.2.1'

Smack 4.2.1
 2017-08-14 21:01:36 +02:00
Florian Schmaus
772e45da92 Introduce NotAPubSubNodeException 
Fixes SMACK-759.
 2017-08-14 20:23:35 +02:00
Florian Schmaus
b9ed22c732 Add MamManager.isSupported() 
Fixes SMACK-777.
 2017-08-14 20:23:35 +02:00
vanitasvitae
4d2036b283
Refactoring 2017-08-14 13:58:48 +02:00
vanitasvitae
5895ca8b07 Merge remote-tracking branch 'upstream/master' into jingle3 2017-08-13 17:22:41 +02:00
Florian Schmaus
0602ae064a Remove deprecated methods from XMPPConnection 2017-08-12 13:36:47 +02:00
vanitasvitae
800bc49239
Fix omemo integration test 2017-08-09 20:57:49 +02:00
vanitasvitae
3927f3089e
Add IncomingFileTransferTest 2017-08-09 19:13:57 +02:00
vanitasvitae
f930c1bdc5
Rename getSid -> getSession/StreamId 
add junit tests for JingleSession
 2017-08-09 16:45:35 +02:00
vanitasvitae
5589143c99
Add missing license 2017-08-05 21:16:50 +02:00
vanitasvitae
0d8b383b1c
Simplify content state handling, add Fallback test 2017-08-05 20:28:36 +02:00
vanitasvitae
9712dc1df7
Merge flowdalic/master 2017-08-05 18:22:07 +02:00
vanitasvitae
1aef1aaadc
Refactoring 2017-08-04 23:05:59 +02:00
vanitasvitae
f0029a65ca
Rename methods for clarity 2017-08-04 22:48:33 +02:00
vanitasvitae
23eb34932f
SOCKS5 works (no external proxy) 2017-08-03 23:01:55 +02:00
vanitasvitae
ff2f66fa67
Do not store peers proposal as transport 2017-08-03 15:11:34 +02:00
vanitasvitae
bfc2561fb2
Fix checkstyle 2017-08-03 12:02:05 +02:00
vanitasvitae
aa8e8592af
JS5B test works 2017-08-02 20:52:52 +02:00
vanitasvitae
1c72fdfa14
More improvements to JS5B test (still fails) 2017-08-01 17:12:27 +02:00
vanitasvitae
22a7e38f66
Add (failing) Jingle S5B test 2017-07-31 15:26:52 +02:00
vanitasvitae
d2f979ed15
JET is close to working 2017-07-31 12:08:18 +02:00
vanitasvitae
177ed6ea0d
Add first JET test 2017-07-30 23:32:00 +02:00
vanitasvitae
af069ffc49
Pass events down to contents 2017-07-29 19:31:16 +02:00
vanitasvitae
185d569b89
Progress 2017-07-28 14:02:32 +02:00
Florian Schmaus
b8ee8d808f Rework Smack debugger. 
Also fixes SMACK-728.
 2017-07-28 12:01:11 +02:00
vanitasvitae
fec28ac7b6
Fix checkstyle issues 2017-07-27 23:31:04 +02:00
vanitasvitae
60cb777ea9
JingleIBBTransportTest works 2017-07-27 22:23:10 +02:00
vanitasvitae
68a03aeb48
IntegrationTest for JingleIBBTransport 2017-07-27 18:09:49 +02:00
vanitasvitae
3ed3f53189
Remove errors 2017-07-27 17:35:16 +02:00
vanitasvitae
438fc0e94b
Start reworking JFT and JET code 2017-07-22 01:01:50 +02:00
vanitasvitae
639c951fd6
Nearly completed work on Jingle SOCKS5 2017-07-21 23:05:46 +02:00
vanitasvitae
6818a52da7
Heavy reworking in progress 2017-07-19 15:17:12 +02:00
vanitasvitae
f9086439a8
Use handler to notify on finished file transfer 2017-07-10 12:46:51 +02:00
vanitasvitae
a11552eb63 Merge branch 'filetransferTypos' into jingle2 2017-07-06 14:15:33 +02:00
vanitasvitae
8bd3856fa1
Fix typos in filetransfer package 2017-07-06 14:01:28 +02:00
vanitasvitae
f26f3bb503
Use static threadPool and start working on async file transfer method 2017-07-02 15:42:16 +02:00
vanitasvitae
59a600a0b6
progress 2017-06-29 21:53:57 +02:00
Florian Schmaus
2b11074950 Merge branch '4.2' 2017-06-17 15:55:38 +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
Florian Schmaus
f5ef42ec56 Merge branch '4.2' 2017-06-02 13:51:56 +02:00
vanitasvitae
e86700b040 Add OMEMO support 
This commit adds the modules smack-omemo and smack-omemo-signal.
smack-omemo is licensed under the Apache license like the rest of the smack project.
smack-omemo-signal on the other hand is licensed under the GPLv3.
Due to the fact, that smack-omemo is not of much use without smack-omemo-signal,
the OMEMO feature can currently only be used by GPLv3 compatible software.
This may change in the future, when a more permissively licensed module becomes available.

Fixes SMACK-743.
 2017-06-02 13:40:10 +02:00
vanitasvitae
655cd873a3
Make sure, archiving is enabled 2017-05-29 22:32:14 +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