vanitasvitae
/
Smack
mirror of https://github.com/vanitasvitae/Smack.git
1
0
Fork 0
Code Issues Releases Wiki Activity
3,213 Commits 61 Branches 35 Tags 36 MiB
Commit Graph

3213 Commits

Author SHA1 Message Date
vanitasvitae e008f1350f
Fix checkstyle issues 2017-08-28 11:55:44 +02:00
vanitasvitae 0c9740864b Merge branch 'jftPR' into jetPR 2017-08-28 11:21:05 +02:00
vanitasvitae d1bc94bfaf
Fix ugly code 2017-08-28 11:20:37 +02:00
vanitasvitae b8584c13a1
Fix ugly code 2017-08-28 11:19:28 +02:00
vanitasvitae 2c421dfe17
Fix ugly code 2017-08-28 11:10:53 +02:00
vanitasvitae d589bdd1a0
Fix ugly code 2017-08-28 11:08:47 +02:00
vanitasvitae 1b1268cdc6
Add javadoc 
More javadoc

Merge branch 'jftPR' into jetPR
 2017-08-26 17:47:04 +02:00
vanitasvitae d088233153
More javadoc 2017-08-25 19:42:19 +02:00
vanitasvitae 5f1d2a7f20
Add javadoc 2017-08-25 19:04:52 +02:00
vanitasvitae 3260429200 Merge branch 'jftPR' into jetPR 2017-08-25 16:35:03 +02:00
vanitasvitae 1743ae9c35
Comment JFT code 2017-08-25 16:34:48 +02:00
vanitasvitae 5bef2f44ce
Comment JET code 2017-08-25 16:34:20 +02:00
vanitasvitae efe0adebe3 Merge branch 'jftPR' into jetPR 2017-08-23 14:14:50 +02:00
vanitasvitae 97baf75a86
Fix cancelling file transfers and create int tests 2017-08-23 14:09:41 +02:00
vanitasvitae d37012cc5a Merge branch 'jftPR' into jetPR 2017-08-22 16:13:25 +02:00
vanitasvitae 8bd4954314
Fix checkstyle 2017-08-22 16:12:50 +02:00
vanitasvitae 6155b90be1
Fix progress listener from merge 2017-08-22 16:08:14 +02:00
vanitasvitae 1ec9768f58 Merge branch 'jftPR' into jetPR 2017-08-22 16:06:58 +02:00
vanitasvitae 50704c45f1
Improve progress listener 2017-08-22 16:06:33 +02:00
vanitasvitae e5d9487b2e Merge branch 'jftPR' into jetPR 2017-08-22 14:45:55 +02:00
vanitasvitae a92e0c876e
Update and use content state 2017-08-22 14:45:38 +02:00
vanitasvitae c77aee7010
Add support for XEP-xxxx Jingle Encrypted Transports 2017-08-20 17:42:10 +02:00
vanitasvitae a53a9f4f76
Add support for XEP-0234 2017-08-20 15:30:15 +02:00
vanitasvitae fb55b6caa8
Latest changes 2017-08-20 15:10:44 +02:00
vanitasvitae d7f974dc69
Add support for XEP-0166, XEP-0260, XEP-0261 2017-08-17 12:18:33 +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
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
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
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
Florian Schmaus f7ae216138 Merge remote-tracking branch 'ignite/4.2' into 4.2 2017-08-01 23:56:29 +02:00
Florian Schmaus a09be93ce7 Merge pull request #159 from ibauersachs/muc-presence-consistency 
Make add/remove for presence interceptors consistent
 2017-08-01 23:52:21 +02:00
Ingo Bauersachs c9b9558cd4 Make add/remove for presence interceptors consistent 2017-08-01 16:17:35 +02:00
Florian Schmaus ed9eae4793 Improve JingleS5BTransportInfo by introducing abstract class 
Introduce a abstract class for shared functionality. And remove static
lazy getters.
 2017-07-30 19:29:11 +02:00
Florian Schmaus b8ee8d808f Rework Smack debugger. 
Also fixes SMACK-728.
 2017-07-28 12:01:11 +02:00
Florian Schmaus b12b13c661 Merge pull request #157 from ibauersachs/bobmanager-order 
Fix parameter ordering in BoBHash construction
 2017-07-23 11:02:43 +02:00
Ingo Bauersachs fc17cf4e2d Fix link to OMEMO extension 2017-07-23 10:58:55 +02:00