vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-06-26 13:24:49 +02:00
Code Issues Releases Wiki Activity
3149 commits 61 branches 35 tags 36 MiB
Commit graph

484 commits

Author SHA1 Message Date
vanitasvitae 6c0162c341
Reuse S5B-Managers discovery methods 2017-06-08 16:46:39 +02:00
vanitasvitae 1775c691af
Create JingleTransportManager framework 2017-06-08 01:59:38 +02:00
vanitasvitae 05b0e3650e
Introduce JingleSocks5TransportInfo class 2017-06-08 00:48:23 +02:00
vanitasvitae f528e4dd9d Merge branch 'TransportInfo' into jingle 2017-06-07 23:29:03 +02:00
vanitasvitae 9eba23c733
Add JingleContentTransportInfo class 2017-06-07 23:26:38 +02:00
vanitasvitae 8240e92c3e
Add S5B providers 2017-06-07 21:08:08 +02:00
vanitasvitae 2686fc1ccb
Proper(er) implementation 2017-06-06 16:51:45 +02:00
Florian Schmaus acc98b4b2f Merge pull request #137 from vanitasvitae/jingleTests 
Add tests for jingle classes
 2017-06-05 19:06:29 +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 3a4f758b6a
Fix jingle ft 2017-06-05 00:27:03 +02:00
vanitasvitae 23190604bd
Fix typos and xml issues 2017-06-04 20:41:27 +02:00
vanitasvitae 491db53f89
Send/recv works 2017-06-04 20:33:44 +02:00
vanitasvitae 598c193408
Progress 2017-06-04 17:18:40 +02:00
vanitasvitae e6d365fb92 Merge branch 'jingleManagerFixes' into jingle 2017-06-04 15:51:07 +02:00
vanitasvitae 37c6961bb0
Fix typos and xml issues 2017-06-04 15:49:06 +02:00
vanitasvitae d231024547
Fix errors 2017-06-04 00:06:37 +02:00
vanitasvitae 0a31161950
Add tests for jingle classes 
Depends on #135, #136
 2017-06-03 23:46:29 +02:00
vanitasvitae efdf6d7db8
Merge fixes (wip) 2017-06-03 23:38:46 +02:00
vanitasvitae ea3b1cbccc
Fix typos and xml issues 2017-06-03 23:30:37 +02:00
vanitasvitae 23ed0bdbce
Add missing security-info in JingleAction 
Also fix typo
 2017-06-03 23:23:23 +02:00
vanitasvitae 1bf8cf9a12
Add missing jingle action, some comments 2017-06-02 21:47:20 +02:00
vanitasvitae 9d34cbc6f3 Merge remote-tracking branch 'upstream/master' into jingle 2017-06-02 18:48:02 +02:00
vanitasvitae df216b2141
More progress 2017-06-02 18:45:11 +02:00
Florian Schmaus f5ef42ec56 Merge branch '4.2' 2017-06-02 13:51:56 +02:00
Florian Schmaus ce36fb468c Increase getSocket() timeout in Socks5ClientForInitiatorTest 
This will hopefully reduce the false negatives when running the unit
tests with Travis CI.
 2017-06-02 12:03:46 +02:00
vanitasvitae 9e1f777332
Simplify providers, add JingleSessionTest 2017-06-01 02:02:40 +02:00
vanitasvitae 306a7bc0ff
Add Jingle Tests 2017-06-01 01:25:39 +02:00
vanitasvitae 1c337cb3c5
Add JingleFileTransferPayload.Builder 2017-05-31 23:17:00 +02:00
vanitasvitae cf875ef414
Fix xml of JingleContent 2017-05-31 20:49:40 +02:00
vanitasvitae 0b28e8b467
Add first dirty send test 2017-05-31 19:12:38 +02:00
vanitasvitae 2cbbfd1048
Add JingleInBandByteStream classes 2017-05-31 17:26:51 +02:00
vanitasvitae b99c277736
Fix typo 2017-05-31 13:31:37 +02:00
vanitasvitae f0e6521360
Add JingleContentDescriptionFileTransfer and tests 2017-05-31 13:27:23 +02:00
vanitasvitae 7319998bb9
Add and test RangeElement 2017-05-30 23:42:31 +02:00
vanitasvitae 47f800be3b
Fix typo 2017-05-30 21:17:10 +02:00
vanitasvitae 53861fa9de
Add HashManager 2017-05-30 20:48:00 +02:00
vanitasvitae 282df8c789
Add first Jingle File Transfer classes 2017-05-30 18:20:54 +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 48b5dc5fe7 Conditionially set the IQ type in ThreadedDummyConnection 
and do not set 'from'.
 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