vanitasvitae
bfd3fbdc5b
Progress
2017-06-07 23:18:23 +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
vanitasvitae
83cedbe00f
Merge remote-tracking branch 'upstream/master' into jingle
2017-06-05 19:07:13 +02:00
acc98b4b2f
Merge pull request #137 from vanitasvitae/jingleTests
...
Add tests for jingle classes
2017-06-05 19:06:29 +02:00
vanitasvitae
eb5b51165e
Merge remote-tracking branch 'upstream/master' into jingle
2017-06-05 12:38:46 +02:00
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
4b50e44135
Merge branch 'jingleManagerFixes' into jingle
2017-06-04 13:05:05 +02:00
vanitasvitae
1da1f6a712
Fix typos and xml issues
2017-06-04 13:02:57 +02:00
f7775bf053
Merge pull request #135 from vanitasvitae/securityInfo
...
Add missing security-info in JingleAction
2017-06-04 10:12:20 +02:00
55ae8193b7
Merge pull request #134 from vanitasvitae/hashes
...
Add Use of Cryptographic Hashfunctions (XEP-300)
2017-06-04 10:11:59 +02:00
vanitasvitae
d231024547
Fix errors
2017-06-04 00:06:37 +02:00
vanitasvitae
ff96a7c336
Merge branch 'jingleTests' into jingle
2017-06-03 23:48:05 +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
9e064a9feb
Merge branch 'securityInfo' into jingle
2017-06-03 23:32:26 +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
28f3130cf9
Add Use of Cryptographic Hashfunctions (XEP-300)
...
Also move bouncycastle dep from smack-omemo to
smack-experimental.
2017-06-03 00:33:56 +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
f5ef42ec56
Merge branch '4.2'
2017-06-02 13:51:56 +02:00
vanitasvitae
e86700b040
Add OMEMO support
...
This commit adds the modules smack-omemo and smack-omemo-signal.
smack-omemo is licensed under the Apache license like the rest of the smack project.
smack-omemo-signal on the other hand is licensed under the GPLv3.
Due to the fact, that smack-omemo is not of much use without smack-omemo-signal,
the OMEMO feature can currently only be used by GPLv3 compatible software.
This may change in the future, when a more permissively licensed module becomes available.
Fixes SMACK-743.
2017-06-02 13:40:10 +02:00
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
cf9dc49bee
Progress. Add Checksum element + provider (wip)
2017-06-01 16:49:58 +02:00
vanitasvitae
1a16565697
Add some listeners and callbacks
2017-06-01 13:43:17 +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
3fb2835633
Reorganize HashManager
2017-05-31 22:31:54 +02:00
vanitasvitae
cf875ef414
Fix xml of JingleContent
2017-05-31 20:49:40 +02:00
vanitasvitae
48ed570bd2
Add content name
2017-05-31 19:32:17 +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
de3c016e3d
Register Provider
2017-05-31 13:33:37 +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
d9e6f6130b
Merge pull request #126 from vanitasvitae/fixReplBuildScript
...
Update smack-repl gradle script
2017-05-31 09:28:50 +02:00
f19a3a03ba
Merge pull request #132 from vanitasvitae/fixMamTest
...
Make sure, archiving is activated
2017-05-31 09:28:26 +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
73c1dac2d1
Add missing license headers
2017-05-30 19:00:59 +02:00
vanitasvitae
Florian Schmaus