1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-11-13 07:42:05 +01:00
Commit graph

3354 commits

Author SHA1 Message Date
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
2f88382b8a Smack 4.2.1 2017-08-14 20:23:35 +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
Florian Schmaus
7404bf8fe7 Fix OMEMO entry in extensions/index.md 2017-08-14 20:15:27 +02:00
Florian Schmaus
b497a236f9 Improve StanzaListner javadoc 2017-08-14 14:18:21 +02:00
4d2036b283
Refactoring 2017-08-14 13:58:48 +02:00
28674a4620
Refactoring 2017-08-13 19:44:02 +02:00
5895ca8b07 Merge remote-tracking branch 'upstream/master' into jingle3 2017-08-13 17:22:41 +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
a9e80dc788
Fix errornous <activate> in s5b, calculate missing dst.addr 2017-08-13 14:38:38 +02:00
Florian Schmaus
f4391c07d7 Rework SmackFuture and add async API based on it 2017-08-12 17:35:45 +02:00
Florian Schmaus
0602ae064a Remove deprecated methods from XMPPConnection 2017-08-12 13:36:47 +02:00
Florian Schmaus
a203d3198c Update Bitcoin Donation address 2017-08-12 12:37:09 +02:00
800bc49239
Fix omemo integration test 2017-08-09 20:57:49 +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
9fe247b1dc
JingleIBBAdapter test + getSid -> getStreamId (S5B) 2017-08-09 19:54:09 +02:00
8263a759b3
Add JingleTransportComparisonTest 2017-08-09 19:50:42 +02:00
4b8ac5a1ab
More Jingle IBB tests 2017-08-09 19:44:31 +02:00
efaa3c27a9
More Jingle IBB tests 2017-08-09 19:26:33 +02:00
3927f3089e
Add IncomingFileTransferTest 2017-08-09 19:13:57 +02:00
901d7b39c5
Test isReceiving, isSending 2017-08-09 18:36:54 +02:00
f930c1bdc5
Rename getSid -> getSession/StreamId
add junit tests for JingleSession
2017-08-09 16:45:35 +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
034b7f3844
More feature-not-implemented and remove crap 2017-08-07 19:53:08 +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
5589143c99
Add missing license 2017-08-05 21:16:50 +02:00
0d8b383b1c
Simplify content state handling, add Fallback test 2017-08-05 20:28:36 +02:00
9712dc1df7
Merge flowdalic/master 2017-08-05 18:22:07 +02:00
62587daa35
Merge master 2017-08-05 17:22:13 +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
c4588eadc6
New JUnit tests and equals methods 2017-08-05 14:30:00 +02:00
Florian Schmaus
7f851d806c Use StandardExtensionElement in JingleProvider
and some further minor jingle fixes:
- deprecate getJingleTransport() in favor of getTransport()
- Jingle.Builder now checks if the session ID is not empty
2017-08-05 11:13:58 +02:00
9c71cb8aeb
Add tests 2017-08-05 00:43:54 +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
cdcf0d590a
Add cleanup for transports, improve content states 2017-08-04 15:08:49 +02:00
cc4de48966
Allow AES agility 2017-08-04 15:08:16 +02:00
a07a1cdc61
Implement transport fallback 2017-08-04 14:06:12 +02:00
23eb34932f
SOCKS5 works (no external proxy) 2017-08-03 23:01:55 +02:00
ff2f66fa67
Do not store peers proposal as transport 2017-08-03 15:11:34 +02:00
bfc2561fb2
Fix checkstyle 2017-08-03 12:02:05 +02:00