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
08a4ee4eb2
Reworked some Jingle unit tests to use Junit's "expected="
...
Also don't use randomString() because then the unit tests also depend
on the correct behavior of it.
2017-06-17 16:08:32 +02:00
2b11074950
Merge branch '4.2'
2017-06-17 15:55:38 +02:00
813219179f
Add support for <text/> elements in SM's <failed/> element
...
Also introduce AbstractTextElement and StanzaErrorTextElement.
Fixes SMACK-760.
2017-06-17 11:43:49 +02:00
1448fa4632
Add ParserUtils.getXmlLang(XmlPullParser)
...
and add TODO comment to PacketParserUtils.getLanguageAttribute().
2017-06-17 11:42:09 +02:00
5424c9635f
Add XmlStringBuilder.optXmlLangAttribute(String)
2017-06-17 11:41:35 +02:00
8038b7a3e1
Add TODO comment about renaming XMPPError to StanzaError
2017-06-17 11:41:07 +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
fdd2ff960c
Merge remote-tracking branch 'upstream/master' into jingle2
2017-06-17 00:26:59 +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
05148ab0ad
Merge pull request #142 from vanitasvitae/jingleIBB
...
Add Jingle InBandBytestream transports
2017-06-16 23:32:59 +02:00
aaad697b02
Merge pull request #140 from vanitasvitae/TransportInfo
...
Add JingleContentTransportInfo class
2017-06-16 23:25:23 +02:00
ddcc7aa568
Merge pull request #141 from vanitasvitae/HashManagerAdditions
...
Add convenience methods to HashManager
2017-06-16 23:25:13 +02:00
6712cc91c8
Merge pull request #139 from vanitasvitae/JingleErrors
...
Remove unused errors and add missing ones
2017-06-16 23:19:50 +02:00
a33d596756
Merge pull request #138 from vanitasvitae/JingleReason
...
Create alternative-session JingleReason
2017-06-16 23:19:14 +02:00
vanitasvitae
5699373cd9
Add method to set Reason
2017-06-16 22:54:32 +02:00
759a7d7a70
Fix InitationListenerTest's timeouts
...
Don't use Thread.sleep(), isntead we use Mockito's timeout() method.
2017-06-16 22:51:14 +02:00
vanitasvitae
b3cec53cc5
Merge branch 'jingleS5B' into jingle2
2017-06-16 22:46:15 +02:00
vanitasvitae
0bc62e3cd9
Merge
2017-06-16 22:46:07 +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
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
e33bb5a741
Reorder imports
2017-06-14 00:01:05 +02:00
vanitasvitae
a604266336
Create alternative-session JingleReason
2017-06-14 00:00:27 +02:00
vanitasvitae
62167a7857
Reorder imports
2017-06-13 23:58:41 +02:00
vanitasvitae
4ae8434852
Remove unused errors and add missing ones
2017-06-13 23:57:59 +02:00
vanitasvitae
95d2cd75ec
Reorder imports
2017-06-13 23:54:47 +02:00
vanitasvitae
3ecd01135c
Add convenience methods to HashManager
2017-06-13 23:51:57 +02:00
vanitasvitae
d49dc71bae
Add JingleContentTransportInfo class
2017-06-08 15:04:25 +02:00
acc98b4b2f
Merge pull request #137 from vanitasvitae/jingleTests
...
Add tests for jingle classes
2017-06-05 19:06:29 +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
23190604bd
Fix typos and xml issues
2017-06-04 20:41:27 +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
0a31161950
Add tests for jingle classes
...
Depends on #135 , #136
2017-06-03 23:46:29 +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
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
d9e6f6130b
Merge pull request #126 from vanitasvitae/fixReplBuildScript
...
Update smack-repl gradle script
2017-05-31 09:28:50 +02:00
vanitasvitae
Florian Schmaus