9d34cbc6f3
Merge remote-tracking branch 'upstream/master' into jingle
2017-06-02 18:48:02 +02:00
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
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
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
cf9dc49bee
Progress. Add Checksum element + provider (wip)
2017-06-01 16:49:58 +02:00
1a16565697
Add some listeners and callbacks
2017-06-01 13:43:17 +02:00
9e1f777332
Simplify providers, add JingleSessionTest
2017-06-01 02:02:40 +02:00
306a7bc0ff
Add Jingle Tests
2017-06-01 01:25:39 +02:00
1c337cb3c5
Add JingleFileTransferPayload.Builder
2017-05-31 23:17:00 +02:00
3fb2835633
Reorganize HashManager
2017-05-31 22:31:54 +02:00
cf875ef414
Fix xml of JingleContent
2017-05-31 20:49:40 +02:00
48ed570bd2
Add content name
2017-05-31 19:32:17 +02:00
0b28e8b467
Add first dirty send test
2017-05-31 19:12:38 +02:00
2cbbfd1048
Add JingleInBandByteStream classes
2017-05-31 17:26:51 +02:00
de3c016e3d
Register Provider
2017-05-31 13:33:37 +02:00
b99c277736
Fix typo
2017-05-31 13:31:37 +02:00
f0e6521360
Add JingleContentDescriptionFileTransfer and tests
2017-05-31 13:27:23 +02:00
Florian Schmaus
d9e6f6130b
Merge pull request #126 from vanitasvitae/fixReplBuildScript
...
Update smack-repl gradle script
2017-05-31 09:28:50 +02:00
Florian Schmaus
f19a3a03ba
Merge pull request #132 from vanitasvitae/fixMamTest
...
Make sure, archiving is activated
2017-05-31 09:28:26 +02:00
7319998bb9
Add and test RangeElement
2017-05-30 23:42:31 +02:00
47f800be3b
Fix typo
2017-05-30 21:17:10 +02:00
53861fa9de
Add HashManager
2017-05-30 20:48:00 +02:00
73c1dac2d1
Add missing license headers
2017-05-30 19:00:59 +02:00
dcd4ab7a86
Improve HashUtilTest
2017-05-30 18:50:44 +02:00
282df8c789
Add first Jingle File Transfer classes
2017-05-30 18:20:54 +02:00
0dbc9b8530
Add Hash classes (XEP-0300)
2017-05-30 18:20:13 +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
655cd873a3
Make sure, archiving is enabled
2017-05-29 22:32:14 +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
Florian Schmaus
847890b037
Don't send 'ask' roster item attribute
...
Fixes SMACK-766.
2017-05-22 16:25:18 +02:00
Florian Schmaus
1f4a728c37
Merge pull request #131 from alextov/patch-1
...
Fix NPE in hashCode() in Occupant when jid is null
2017-05-19 13:29:19 +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
cb971f2e10
Bump Clirr Gradle Plugin to 0.2.2
2017-05-16 15:53:03 +02:00
Florian Schmaus
ac626f248a
Add TODOs about the removal of deprecated methods
2017-05-16 15:53:03 +02:00
Florian Schmaus
dcf7406fa4
Add UnknownIqRequestReplyMode
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
f48f0cab5b
Travis-CI: Re-enable coveralls
...
which got accidentally disabled when we switched to Java 8 builds
only.
2017-05-16 15:52:24 +02:00
Florian Schmaus
cab5596a0e
Travis-CI: Use gradle 3.5
2017-05-16 15:52:24 +02:00
Florian Schmaus
31fe9dcd80
Fix NoWhitespaceAfter checkstyle violation
...
in smack-legacy
2017-05-16 15:52:24 +02:00
Florian Schmaus
45b790bbbb
Fix NoWhitespaceAfter checkstyle violation
...
in smack-jingle-old
2017-05-16 15:52:24 +02:00
Florian Schmaus
45edc969c9
Fix NoWhitespaceAfter checkstyle violation
...
in StringUtils.
2017-05-16 15:52:24 +02:00
Florian Schmaus
162dee0a47
Fix IotIsFriendResponse element name and XML
...
Fixes SMACK-756
2017-04-25 17:07:19 +02:00
Florian Schmaus
724421e1ae
Merge pull request #128 from vanitasvitae/applyPluginIdea
...
Apply idea plugin for Intellij
2017-04-25 07:42:41 +02:00
92902091ff
Apply idea plugin for Intellij
2017-04-24 22:58:52 +02:00
Florian Schmaus
9319aa28c6
Add Appendix to LICENSE
2017-04-24 15:12:27 +02:00
Florian Schmaus
9154fa6891
Merge pull request #127 from vanitasvitae/fixStoreHint
...
Fix StoreHint (wrong element name)
2017-04-24 00:02:51 +02:00