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

202 commits

Author SHA1 Message Date
aeab6504a7
Merge upstream 2017-08-16 15:46:32 +02:00
e1655aa344
Cleanup code 2017-08-16 15:36:49 +02:00
Florian Schmaus
2a97d7c5ea Don't reinvent methods in HashManager
use the existing API from StringUtils instead.

Also rename StringUtils.toBytes() to 'toUtf8Bytes()'.
2017-08-16 14:55:25 +02:00
Florian Schmaus
6565618840 Encode algorithm recommendation in HashManager 2017-08-16 14:38:22 +02:00
Florian Schmaus
ba323b51f9 Remove API parts scheduled to be removed in Smack 4.3 2017-08-16 14:31:46 +02:00
Florian Schmaus
80eaaf2d71 Fix warnings 2017-08-16 14:10:00 +02:00
Florian Schmaus
6203d163c4 Deprecate old async API 2017-08-16 13:46:42 +02:00
e53165a96c
Improve JFT API 2017-08-15 17:43:06 +02:00
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
b9ed22c732 Add MamManager.isSupported()
Fixes SMACK-777.
2017-08-14 20:23:35 +02:00
4d2036b283
Refactoring 2017-08-14 13:58:48 +02:00
28674a4620
Refactoring 2017-08-13 19:44:02 +02:00
7744b244e8
Fix S5B test 2017-08-13 17:22:26 +02:00
ef23aad7b2
Improve jft api 2017-08-13 14:38:53 +02:00
72f2f6c59a
Add JetElementTest 2017-08-09 20:46:13 +02:00
71e5ff843a
Delete unused IncomingFileOfferCallback 2017-08-09 19:58:35 +02:00
3927f3089e
Add IncomingFileTransferTest 2017-08-09 19:13:57 +02:00
a23eb6aeea
Add UnknownSecurityElement
Fix parsing of JingleSecurityElements
Switch to 12 byte IV for AES keys
2017-08-09 10:45:34 +02:00
792a9a348b
FIX F%?§@N SOCKS5 2017-08-07 23:55:32 +02:00
cac35d74b4
Check for disco support before file transfers 2017-08-07 14:35:00 +02:00
6fad0b9fab
Add Gajim fixes,
Return feature-not-implemented when suitable,
try next transport on transport-reject.
2017-08-07 11:36:40 +02:00
bee9ef0f08
Fix file path separator 2017-08-06 00:27:51 +02:00
9712dc1df7
Merge flowdalic/master 2017-08-05 18:22:07 +02:00
dcdee8d21a
More cipher tests 2017-08-05 17:16:04 +02:00
533cb97f7d
Add cipher test 2017-08-05 15:29:01 +02:00
066d366dd5
fix checkstyle issues 2017-08-05 14:44:59 +02:00
1aef1aaadc
Refactoring 2017-08-04 23:05:59 +02:00
f0029a65ca
Rename methods for clarity 2017-08-04 22:48:33 +02:00
cc4de48966
Allow AES agility 2017-08-04 15:08:16 +02:00
22a7e38f66
Add (failing) Jingle S5B test 2017-07-31 15:26:52 +02:00
45563b75fe
Fix checkstyle 2017-07-31 14:57:43 +02:00
422660e9fe
JET WORKSgit add .! 2017-07-31 14:21:49 +02:00
d2f979ed15
JET is close to working 2017-07-31 12:08:18 +02:00
177ed6ea0d
Add first JET test 2017-07-30 23:32:00 +02:00
b0b46ad167
More progress on JET 2017-07-30 22:31:29 +02:00
c82b25ea09
Work on Jingle Encrypted Transfers 2017-07-30 15:40:04 +02:00
1dbdafe28c
Basic Sending/Receiving Files works again 2017-07-29 22:21:36 +02:00
af069ffc49
Pass events down to contents 2017-07-29 19:31:16 +02:00
185d569b89
Progress 2017-07-28 14:02:32 +02:00
fec28ac7b6
Fix checkstyle issues 2017-07-27 23:31:04 +02:00
3ed3f53189
Remove errors 2017-07-27 17:35:16 +02:00
3f6df8e6c7
Notifiers and ProgressListeners 2017-07-27 16:43:09 +02:00
5ce12974c8
Work on file transfer listeners 2017-07-27 15:58:11 +02:00
980c324f27
Some refactoring 2017-07-27 15:18:18 +02:00
4234e1d5ab
Anonymous progress 2017-07-27 00:12:42 +02:00
186dfd224e
Work on JingleFileTransfer 2017-07-26 16:17:33 +02:00
c0e5fcf737
Some work on Jingle File Transfer 2017-07-25 20:25:36 +02:00
438fc0e94b
Start reworking JFT and JET code 2017-07-22 01:01:50 +02:00
639c951fd6
Nearly completed work on Jingle SOCKS5 2017-07-21 23:05:46 +02:00