Commit Graph

3374 Commits

Author SHA1 Message Date
vanitasvitae c46bc6d6dd
Remove annotations 2017-08-20 15:19:09 +02:00
vanitasvitae 27f6922cf6
Simplify file API, allow sending hash with file 2017-08-20 14:58:46 +02:00
vanitasvitae 6c51424949
Cancel declines file offers 2017-08-20 13:46:30 +02:00
vanitasvitae a08e835a52
Don't postpone session-initiate ack 2017-08-18 14:28:44 +02:00
vanitasvitae 524660c870
Allow sending streams in JET 2017-08-16 19:58:43 +02:00
vanitasvitae 7e7be0f47b
Properly allow sending streams 2017-08-16 18:20:56 +02:00
vanitasvitae eb413f30b1
Refactor JET in order to match spec 2017-08-16 16:42:11 +02:00
vanitasvitae 5edd630fd0
Remove unnecessary class 2017-08-16 15:59:16 +02:00
vanitasvitae aeab6504a7
Merge upstream 2017-08-16 15:46:32 +02:00
vanitasvitae e1655aa344
Cleanup code 2017-08-16 15:36:49 +02:00
Florian Schmaus 9bb0ed150b Merge pull request #165 from pocman/patch-1
Keep 4.1.9 chat.sendMessage(String) behavior
2017-08-16 15:18:52 +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
Florian Schmaus 798d158d32 Make SmackFuture.getOrThrow() throw InterruptedException 2017-08-16 13:45:51 +02:00
vanitasvitae e53165a96c
Improve JFT API 2017-08-15 17:43:06 +02:00
vanitasvitae d7df408661
Add JingleContent tests 2017-08-15 00:11:00 +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 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
vanitasvitae 4d2036b283
Refactoring 2017-08-14 13:58:48 +02:00
vanitasvitae 28674a4620
Refactoring 2017-08-13 19:44:02 +02:00
vanitasvitae 5895ca8b07 Merge remote-tracking branch 'upstream/master' into jingle3 2017-08-13 17:22:41 +02:00
vanitasvitae 7744b244e8
Fix S5B test 2017-08-13 17:22:26 +02:00
vanitasvitae ef23aad7b2
Improve jft api 2017-08-13 14:38:53 +02:00
vanitasvitae 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
Thomas b70e80b1ad Keep 4.1.9 chat.sendMessage(String) behavior
chat2.Chat.send(String) should have the same behavior as chat.Chat.sendMessage(String)
2017-08-11 10:30:05 +02:00
vanitasvitae 800bc49239
Fix omemo integration test 2017-08-09 20:57:49 +02:00
vanitasvitae 72f2f6c59a
Add JetElementTest 2017-08-09 20:46:13 +02:00
vanitasvitae 71e5ff843a
Delete unused IncomingFileOfferCallback 2017-08-09 19:58:35 +02:00
vanitasvitae 9fe247b1dc
JingleIBBAdapter test + getSid -> getStreamId (S5B) 2017-08-09 19:54:09 +02:00
vanitasvitae 8263a759b3
Add JingleTransportComparisonTest 2017-08-09 19:50:42 +02:00
vanitasvitae 4b8ac5a1ab
More Jingle IBB tests 2017-08-09 19:44:31 +02:00
vanitasvitae efaa3c27a9
More Jingle IBB tests 2017-08-09 19:26:33 +02:00
vanitasvitae 3927f3089e
Add IncomingFileTransferTest 2017-08-09 19:13:57 +02:00
vanitasvitae 901d7b39c5
Test isReceiving, isSending 2017-08-09 18:36:54 +02:00
vanitasvitae f930c1bdc5
Rename getSid -> getSession/StreamId
add junit tests for JingleSession
2017-08-09 16:45:35 +02:00
vanitasvitae a23eb6aeea
Add UnknownSecurityElement
Fix parsing of JingleSecurityElements
Switch to 12 byte IV for AES keys
2017-08-09 10:45:34 +02:00
vanitasvitae 792a9a348b
FIX F%?§@N SOCKS5 2017-08-07 23:55:32 +02:00
vanitasvitae 034b7f3844
More feature-not-implemented and remove crap 2017-08-07 19:53:08 +02:00
vanitasvitae cac35d74b4
Check for disco support before file transfers 2017-08-07 14:35:00 +02:00