vanitasvitae
e0a54c19d6
First state representing stuff
2017-06-19 14:44:35 +02:00
vanitasvitae
1912ebb8d0
Join JingleSession and Handler in JingleFT
2017-06-19 10:47:24 +02:00
vanitasvitae
b91a9c120f
More ground work
2017-06-18 16:47:49 +02:00
vanitasvitae
dcb5da76d6
Merge branch 'jingleFTElements' into jingle2
2017-06-18 14:12:04 +02:00
vanitasvitae
e5502564b1
Add more errors
2017-06-18 14:11:37 +02:00
vanitasvitae
49868ecdaf
Merge branch 'jingleFTElements' into jingle2
2017-06-18 13:08:56 +02:00
vanitasvitae
d3af7cd9c1
Add creating methods to JingleUtil
2017-06-18 13:08:09 +02:00
vanitasvitae
d0701f8fd1
Merge branch 'jingleS5B' into jingle2
2017-06-18 12:32:08 +02:00
vanitasvitae
21435a72c5
Reorder imports
2017-06-18 12:29:44 +02:00
vanitasvitae
20e6580469
Merge remote-tracking branch 'upstream/master' into jingleFTElements
2017-06-18 12:11:17 +02:00
vanitasvitae
3c4441af4f
Reorder imports
2017-06-18 12:08:47 +02:00
vanitasvitae
93a363377e
Merge remote-tracking branch 'upstream/master' into jingleS5B
2017-06-18 12:05:15 +02:00
vanitasvitae
d34539126b
Fix import order
2017-06-18 11:52:56 +02:00
vanitasvitae
1e6b9b8257
Merge remote-tracking branch 'upstream/master' into jingle2
2017-06-18 11:28:39 +02:00
Florian Schmaus
2b11074950
Merge branch '4.2'
2017-06-17 15:55:38 +02:00
vanitasvitae
2f3de3a64d
Add Jingle File Transfer elements and JingleUtil class
2017-06-17 00:56:32 +02:00
vanitasvitae
6cb23d08e0
Add Jingle File Transfer elems and providers
2017-06-17 00:40:51 +02:00
vanitasvitae
46b352ef88
Add JingleFileTransfer class
2017-06-17 00:26:44 +02:00
vanitasvitae
f783ecab4b
Move ft to experimental, more jingleUtil stuff
2017-06-17 00:17:21 +02:00
vanitasvitae
2ee10fa83b
Merge branch 'JingleErrors' into jingle2
2017-06-17 00:04:13 +02:00
vanitasvitae
f80472e082
Fix reviewed points
2017-06-16 23:45:00 +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
b3cec53cc5
Merge branch 'jingleS5B' into jingle2
2017-06-16 22:46:15 +02:00
vanitasvitae
287976e0e0
Add Jingle InBandBytestream transports
2017-06-16 22:43:50 +02:00
vanitasvitae
8488831ddc
Add Jingle SOCKS5Bytestream transport
2017-06-16 22:14:42 +02:00
vanitasvitae
d1e0a4683f
Merge branch 'jingleIBB' into jingle2
2017-06-16 21:55:50 +02:00
vanitasvitae
6b472d0ccd
Add JingleUtil
2017-06-16 21:55:42 +02:00
vanitasvitae
3c6ca94cb4
Add Jingle InBandBytestream transports
2017-06-16 21:52:20 +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