1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-11-01 17:55:59 +01:00
Commit graph

4161 commits

Author SHA1 Message Date
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
e33bb5a741
Reorder imports 2017-06-14 00:01:05 +02:00
a604266336
Create alternative-session JingleReason 2017-06-14 00:00:27 +02:00
62167a7857
Reorder imports 2017-06-13 23:58:41 +02:00
4ae8434852
Remove unused errors and add missing ones 2017-06-13 23:57:59 +02:00
95d2cd75ec
Reorder imports 2017-06-13 23:54:47 +02:00
3ecd01135c
Add convenience methods to HashManager 2017-06-13 23:51:57 +02:00
d49dc71bae
Add JingleContentTransportInfo class 2017-06-08 15:04:25 +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
23190604bd
Fix typos and xml issues 2017-06-04 20:41:27 +02:00
Florian Schmaus
f7775bf053 Merge pull request #135 from vanitasvitae/securityInfo
Add missing security-info in JingleAction
2017-06-04 10:12:20 +02:00
Florian Schmaus
55ae8193b7 Merge pull request #134 from vanitasvitae/hashes
Add Use of Cryptographic Hashfunctions (XEP-300)
2017-06-04 10:11:59 +02:00
0a31161950
Add tests for jingle classes
Depends on #135, #136
2017-06-03 23:46:29 +02:00
23ed0bdbce
Add missing security-info in JingleAction
Also fix typo
2017-06-03 23:23:23 +02:00
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
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
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
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
6bebeb354b
Fix StoreHint (wrong element name) 2017-04-23 23:37:14 +02:00
Florian Schmaus
bb2d03e30a Remove spurious package-info.java in root directory 2017-04-22 19:04:54 +02:00
Florian Schmaus
ba2a287112 Add support for XEP-0380: Explicit Message Encryption
Fixes SMACK-746
2017-04-22 18:58:39 +02:00
Florian Schmaus
142297042c Add support for XEP-0334: Message Processing Hints
Fixes SMACK-758
2017-04-22 17:50:39 +02:00
842cc2c2a4
Fix smack-repl build script 2017-04-20 22:40:53 +02:00
Florian Schmaus
b51d5070fc Log LazyStringBuilder instances throwing a NPE 2017-04-19 20:09:32 +02:00