Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-12-26 22:27:58 +01:00
Code Issues Releases Wiki Activity
3851 commits 8 branches 0 tags 34 MiB
Commit graph

3851 commits

This branch
This branch
All branches
Author SHA1 Message Date
Florian Schmaus
b94b2586e2 Smack 4.1.7 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQF8BAABCgBmBQJXD/2lXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQxMzU3QjAxODY1QjI1MDNDMTg0NTNEMjA4
 Q0FDMkE5Njc4NTQ4RTM1AAoJEIysKpZ4VI41rggH/0DjBLpCfTSdjjKGFNChc+1V
 dW9PaPGFUiPuTt3T2NEa74jGYe4PsPpy5zDsJ8uYi2aq3LAiCQvfk+F5LXjRJFoa
 eftz0GtPvfP42oFg8wyDAebFtb0OtE7aJueSRkYGhA1+kzHBbJ9s6TxqDWcB0UWC
 puLh/DEWDFGX5njln+l10O7b10G0+bSrvece22eP0sQIv4hvZJoPQ5rOpCR1wibL
 ldp6wXI6C/b/oQS9MjHq9SV10S+5GykBqN/UzcFnwRVHLbasqnXeNFLGOnMtx0g9
 DmOolAYKGBN5m7m0rqEj9R+OyNgtefV8sCHE69iNAlpQhbmTqPd5rIhIXIII4U4=
 =yWKV
 -----END PGP SIGNATURE-----

Merge tag '4.1.7'

Smack 4.1.7
 2016-04-14 22:30:34 +02:00
Florian Schmaus
145fa02a48 Smack 4.1.7 2016-04-14 22:18:36 +02:00
Florian Schmaus
58d9f4e749 Use Locale.US in XMPPError.Type ↔ String conversion 
Fixes SMACK-719
 2016-04-12 15:05:56 +02:00
Florian Schmaus
8235e8417d Use simple name in StanzaTypeFilter 2016-04-12 15:05:56 +02:00
Florian Schmaus
a4fc39d95f Add Android jar to classpath 2016-04-12 14:52:38 +02:00
Florian Schmaus
e1dfb53483 Check answer data in MiniDnsResolver 
for the correct RR type.
 2016-04-10 20:09:22 +02:00
Craig
189982a9ba Fixed documentation in PayloadItem.java and ItemsExtension.java 
Made the formatting similar to that in Item.java
 2016-04-08 22:54:18 +02:00
Florian Schmaus
b59356c9bf Travis-CI: Use Gradle 2.12 2016-04-08 22:29:59 +02:00
Florian Schmaus
f351919fa5 Switch to Ammonite REPL 
It comes with working tab completion. \o/
 2016-02-23 16:30:20 +01:00
Florian Schmaus
e6db731810 Add Roster.setRosterLoadedAtLoginDefault(boolean) 
Fixes SMACK-715
 2016-02-17 09:22:40 +01:00
Tomas Nosek
cf3024668e Fix XMPPTCPConnection.setEnabledSSL(Protocols|Ciphers) 
The problem caused by opening input/ output stream before setting ssl
parameters to SSLSession and fixed by changing order of this operations.

Fixes SMACK-712.

Minor-Modifications-By: Florian Schmaus <flo@geekplace.eu>
 2016-02-17 09:18:36 +01:00
Florian Schmaus
bcdfb5398a Fix EntityTimeManager.getTime(): Set recipient JID 
Fixes SMACK-716
 2016-02-17 09:13:06 +01:00
Florian Schmaus
5c00172f6a Remove log statement 
was added to diagnose an issue, should have never made it into master.
 2016-02-10 14:54:32 +01:00
Florian Schmaus
8f149346a6 Add a REPL for Smack (smack-repl) 2016-02-10 14:52:33 +01:00
Florian Schmaus
529e1eb058 Fix 'test' dependencies 
The previously used approach of

project(':smack-core').sourceSets.test.runtimeClasspath

caused the 'eclipse' target to produce duplicate classpath entries in
.classpath when run with Gradle >= 2.6. It also relied on Gradle
internals.

Instead we now use

project(path: ":smack-core", configuration: "testRuntime")
project(path: ":smack-core", configuration: "archives")

to be able to use test classes from other subprojects (usually
smack-core) in e.g. smack-extensions. The 'archives' configuration
includes the test jar.

See also https://discuss.gradle.org/t/11784

Thanks to Lari Hotari for helping with this issue.
 2016-02-10 12:39:18 +01:00
Florian Schmaus
f571b6ef5b Verify Bytestream constructor arguments 2016-02-10 12:37:45 +01:00
Florian Schmaus
4fb3630896 Socks5Client: Throw SmackException instead of IOExecption 
So that we can wrap the original exception within the
SmackException. It's not possible to wrap it into the IOException
because of the used min Android API level.
 2016-02-10 12:36:38 +01:00
Florian Schmaus
263578fd63 Merge pull request #67 from rohanag12/master 
Update DefaultExtensionElement.java
 2016-01-30 09:54:51 +01:00
rohanag12
d69265774b Update DefaultExtensionElement.java 
Removed duplicate word from description
 2016-01-30 12:44:43 +05:30
Florian Schmaus
c8d6cc2b6c Smack 4.2.0-alpha4-SNAPSHOT 2016-01-26 09:41:49 +01:00
Florian Schmaus
269105b2de Smack 4.2.0-alpha3 2016-01-26 08:43:46 +01:00
Florian Schmaus
e0cbb95b5d Check callbackHandler/keystorePath for null 
before using it.
 2016-01-23 14:16:38 +01:00
Florian Schmaus
d5c7eb7349 Remove unnecessary code in XMPPTCPConnection 2016-01-23 14:16:37 +01:00
Florian Schmaus
085c3469e9 Fix XMPPTCPConnection.proceedTLSReceived() 
The method was changed in c6594aec2f, but
this change causes issues if Smack is used on Android *without* a custom
SSLContext:

Caused by: java.security.KeyStoreException: java.security.NoSuchAlgorithmException: KeyStore jks implementation not found
 at java.security.KeyStore.getInstance(KeyStore.java:119)
 at org.jivesoftware.smack.tcp.XMPPTCPConnection.proceedTLSReceived(XMPPTCPConnection.java:697)

Caused by: java.security.NoSuchAlgorithmException: KeyManagerFactory SunX509 implementation not found
 at org.apache.harmony.security.fortress.Engine.notFound(Engine.java:177)
 at org.apache.harmony.security.fortress.Engine.getInstance(Engine.java:151)
 at javax.net.ssl.KeyManagerFactory.getInstance(KeyManagerFactory.java:77)
 at org.jivesoftware.smack.tcp.XMPPTCPConnection.proceedTLSReceived(XMPPTCPConnection.java:708)
 2016-01-23 14:16:37 +01:00
Florian Schmaus
0761fe0dec Pass down Message stanza in ChatStateListener 
Fixes SMACK-704.
 2016-01-23 13:55:09 +01:00
Florian Schmaus
85e818cffb Smack 4.1.6 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQF8BAABCgBmBQJWo2DDXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQxMzU3QjAxODY1QjI1MDNDMTg0NTNEMjA4
 Q0FDMkE5Njc4NTQ4RTM1AAoJEIysKpZ4VI41Q0AH/22s1WOI0mgFjQnuSRoZwtNQ
 WN7eudnKlnknmNrJwPcbW1EYO/kNj1SQnqv7ed2aVpyeFFOf1/CUIgq57K1hBjA0
 gTVtv0vK9pABZOmYY5UYURF6AZqKC2s5grHzOgIQbEhT0IOxc/Kz3/ubRxYwvxQl
 lKenkNw75NMViylC0wFQc673SUuwPKyS3PjFm44ASxhbHNIexqagsxNU3MICmCWr
 vGuyv2pGuVvVbILdqqoRGJhucHUs8HnYjA/H1lAlXH4FE0k3EXnjtztHaiLXQoxC
 I2MbunwlVWcE5099V85wcgBbtMWqgljyz+Yh8MmkPojZTVnWjYPUWybK4G8TREg=
 =1rYD
 -----END PGP SIGNATURE-----

Merge tag '4.1.6'

Smack 4.1.6
 2016-01-23 13:27:16 +01:00
Florian Schmaus
a89b9301ad Smack 4.1.7-SNAPSHOT 2016-01-23 12:25:23 +01:00
Florian Schmaus
73c531f841 Smack 4.1.6 2016-01-23 12:14:40 +01:00
Florian Schmaus
8650a07228 Quote backslash in provided DIGEST-MD5 implementation 
Fixes SMACK-710.
 2016-01-23 12:08:44 +01:00
Andrey Starodubtsev
f8d04262c3 Couple of fixes in providers.md 
Mixed tabs and spaces fixed and made list of extension providers for
standard packets nested.
 2016-01-18 22:10:18 +01:00
Andrey Starodubtsev
35ba917728 Fix a couple of javadoc warnings 2016-01-18 22:08:43 +01:00
Florian Schmaus
89bd13318a Fix typo in CapsExtensionProvider: s/elment/element/ 2016-01-18 22:08:23 +01:00
Florian Schmaus
23201d5f0f Improve logging of failed presence extensions 
Don't log the exception for now because the stack trace makes to much
noise in the log output. This is mostly caused by Googles outdated
Entity Capabilities implementation.
 2016-01-18 22:08:23 +01:00
Florian Schmaus
e6a9027cc6 Improve StringUtils.escapeForXml() 2016-01-18 22:04:20 +01:00
Florian Schmaus
f2a748db9a Format test strings of DataLayoutTest 2016-01-18 22:04:20 +01:00
Florian Schmaus
62bb02af8c README: Add #smack IRC badge from kiwiirc 2016-01-15 14:45:40 +01:00
Florian Schmaus
0d47e65c96 Remove unnecessary code to enable stream mangement 
it is now enabled per default. See also
57838f1ffe and SMACK-655.
 2016-01-10 19:44:33 +01:00
Florian Schmaus
2539c10246 Fix javadoc of ConnectionException 
Related to SMACK-711.
 2016-01-10 19:38:29 +01:00
Florian Schmaus
8997a7d8f3 Fix typo in RosterEntries 
s/rosterEntires/rosterEntries/

Fixes SMACK-666 (the issue of the devil).
 2016-01-10 19:00:26 +01:00
Florian Schmaus
57838f1ffe Enable Stream Management by default 
Fixes SMACK-655.
 2016-01-10 18:57:19 +01:00
Florian Schmaus
7845f21465 Only create the socket once 
in XMPPTCPConnection.connectUsingConfiguration().
 2016-01-10 18:34:54 +01:00
Florian Schmaus
ac0c05be04 StringUtils: Make randGen and numbersAndLetters final 2016-01-10 18:34:54 +01:00
Florian Schmaus
7a8d66e9e6 Improve logging of failed connection attempts 
also improve XMPPTCPConnection.connectUsingConfiguration(): Try further
hostAddresses if getAllByName failes.

Fixes SMACK-711
 2016-01-10 18:34:54 +01:00
Florian Schmaus
658a671cbe Make StringUtils.randomString(int) use SecureRandom 2016-01-10 18:21:46 +01:00
Florian Schmaus
f79a7d9d5f Fix javadoc warnings 2015-12-19 13:30:15 +01:00
damencho
46f0110949 Fix sending pubsub events for empty item 
XEP-0060 allows no elements on second level of nodes.

Modified-by: Florian Schmaus <flo@geekplace.eu>
 2015-12-18 08:19:21 +01:00
Florian Schmaus
72c7137ff1 Don't request receipts for messages without a body 
SMACK-709
 2015-12-14 11:36:37 +01:00
Florian Schmaus
09364e571c Ensure that delivery receipts/requests have ID set 
Fixes SMACK-708.
 2015-12-13 22:42:50 +01:00
Florian Schmaus
f34f37a20c Check for 'null' to avoid NPE in Socks5Proxy 
Check if serverSocket is null before calling isClosed(), as otherwise
the resulting NPE will cause an endless loop.

Thanks to Michael Grafl for reporting.

Fixes SMACK-707.
 2015-12-10 17:10:49 +01:00
Florian Schmaus
feff081547 Add "Roster loading failed" callback 2015-12-09 10:56:24 +01:00