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

459 Commits

Author SHA1 Message Date
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 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 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 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
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
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
Ingo Bauersachs 0b8788a9fc Fix parameter ordering in BoBHash construction 2017-07-20 22:50:34 +02:00
Florian Schmaus 104146c5ed Add Jingle.getSoleContentOrThrow() 2017-07-17 21:05:56 +02:00
Florian Schmaus 8f808b38e1 Merge pull request #153 from vanitasvitae/fixReason 
Allow parsing of JingleReason.AlternativeSession
 2017-07-08 08:24:17 +02:00
vanitasvitae 58c32639b5
Allow parsing of JingleReason.AlternativeSession 
The JingleReasonProvider was faulty and ignored the
<alternative-session> element.
 2017-07-06 16:55:12 +02:00
vanitasvitae 8bd3856fa1
Fix typos in filetransfer package 2017-07-06 14:01:28 +02:00
vanitasvitae 7e76bc1ae5
More changes to the Jingle package: 
- Change visibility of some Socks5Bytestreams code.
- Add central ThreadPool
- Move FullJidAndSessionId in own class
- More complete JingleSession class
- More complete JingleUtil class
- Improved tests
 2017-07-03 10:35:46 +02:00
vanitasvitae 5bd01b7385
Add Jingle File Transfer elements and JingleUtil class 2017-06-30 15:03:13 +02:00
Florian Schmaus 541c9ecfdd Fix compile errors in jingle code 
Which where introduced by merging

20eabca1b3

after

b14aca744f
 2017-06-29 18:09:25 +02:00
Florian Schmaus 1d53889874 Merge pull request #145 from vanitasvitae/singleJingleTransport 
Switch to single transport instead of list
 2017-06-28 21:02:52 +02:00
vanitasvitae 20eabca1b3
Also replace list with single transport-info info 2017-06-26 15:04:22 +02:00
vanitasvitae e2b8ffdf22
Switch to single transport instead of list 2017-06-21 13:42:02 +02:00
vanitasvitae b14aca744f
Add Jingle SOCKS5Bytestream transport method 2017-06-19 10:11:08 +02:00
Florian Schmaus 2b11074950 Merge branch '4.2' 2017-06-17 15:55:38 +02:00
Florian Schmaus 05148ab0ad Merge pull request #142 from vanitasvitae/jingleIBB 
Add Jingle InBandBytestream transports
 2017-06-16 23:32:59 +02:00
Florian Schmaus aaad697b02 Merge pull request #140 from vanitasvitae/TransportInfo 
Add JingleContentTransportInfo class
 2017-06-16 23:25:23 +02:00
Florian Schmaus 6712cc91c8 Merge pull request #139 from vanitasvitae/JingleErrors 
Remove unused errors and add missing ones
 2017-06-16 23:19:50 +02:00
vanitasvitae 5699373cd9
Add method to set Reason 2017-06-16 22:54:32 +02:00
vanitasvitae 287976e0e0
Add Jingle InBandBytestream transports 2017-06-16 22:43:50 +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
vanitasvitae a604266336
Create alternative-session JingleReason 2017-06-14 00:00:27 +02:00
vanitasvitae 4ae8434852
Remove unused errors and add missing ones 2017-06-13 23:57:59 +02:00
vanitasvitae d49dc71bae
Add JingleContentTransportInfo class 2017-06-08 15:04:25 +02:00
Florian Schmaus 349d1ba2ae Merge pull request #136 from vanitasvitae/jingleManagerFixes 
Fix typos and xml issues in jingle package
 2017-06-05 11:04:52 +02:00
vanitasvitae 23190604bd
Fix typos and xml issues 2017-06-04 20:41:27 +02:00
vanitasvitae 23ed0bdbce
Add missing security-info in JingleAction 
Also fix typo
 2017-06-03 23:23:23 +02:00
Florian Schmaus 6bb001d274 New Jingle API groundwork 
A start for the new Jingle API. Since Jingle is a single IQ with many
plugable extensions, there are some particularities we need to deal
with, e.g. jingle users have to register with JingleManager.

This is untested code. There may be drangons.
 2017-05-30 08:45:27 +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
Alexander Tovstonozhenko b636883ce6 Fix NPE in hashCode() in Occupant when jid is null 
Fixes SMACK-764.
 2017-05-19 14:09:19 +03:00
Florian Schmaus 5f900d3713 Add PingManager.pingAsync(Jid, long) 
and SmackFuture API.
 2017-05-16 15:53:03 +02:00
Florian Schmaus 5aab471d64 Improve handling of error response "Pongs" 2017-05-16 15:53:03 +02:00
Florian Schmaus 24f6d86452 Fix typo: s/ProsoydWorkaround/ProsodyWorkaround/ 2017-04-19 12:23:17 +02:00
Florian Schmaus ddf888e607 Do not return null in getLeafNodeProsodyWorkaround 
and rethrow the original exception.
 2017-04-19 12:21:04 +02:00
Florian Schmaus bfab3ec578 PubSubManager.getLeafNode(): Actually employ the prosody workaround 2017-04-19 11:50:01 +02:00
Florian Schmaus e6a51f2151 Add PubSubManager.getLeafNode() and improve prosody workaround 
by using the protected constructor and not reflection.
 2017-04-19 11:46:39 +02:00
vanitasvitae 10927577ad
Fix getOrCreateLeafNode for prosody 2017-04-19 11:34:47 +02:00
Florian Schmaus c636e72a9d Change behavior of send()/publish() in LeafNode 
Previously publish() was "asynchronously" in that sense that the response
of the IQ as *not* awaited, and send() would wait for the
responses. It makes no sense to have that functionality this way.

Instead we now make publish() to the right thing, i.e., wait for an IQ
result, make send() a proxy for publish(), and mark send() deprecated.

In the future, there may be a publishAsync() method which returns a
Future instance.
 2017-04-06 15:11:04 +02:00