Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-18 13:02:04 +01:00
Code Issues Releases Wiki Activity
3985 commits 8 branches 0 tags 34 MiB
Commit graph

3985 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Florian Schmaus
45feaecdf7 Make XMPPError imutable and add stanza reference 2015-12-09 10:48:52 +01:00
Florian Schmaus
83eda4c58d Make EventContentFilter's members 'final' 2015-12-06 22:49:48 +01:00
Florian Schmaus
54ba300dc5 Make EventContentFilter use FlexiableStanzaTypeFilter<Message> 2015-12-06 22:48:22 +01:00
damencho
db72917bb4 Uses voice as default number detail, if no type is available. 2015-12-06 17:37:20 +01:00
damencho
035bbea837 Reply with service-unavailable for unhandled IQ requests 
instead of feature-not-implemented.

Changes to send service-unavailable for not handled iq as said in
RFC6120 § 8.4: https://tools.ietf.org/html/rfc6120#page-128

"""
o  If an intended recipient receives an IQ stanza of type "get" or
   "set" containing a child element qualified by a namespace it does
   not understand, then the entity MUST return an IQ stanza of type
   "error" with an error condition of <service-unavailable/>.
"""
 2015-12-06 17:09:47 +01:00
Florian Schmaus
f3817d6358 Don't cache all presences from entities not in Roster 
Fixes SMACK-703
 2015-12-04 14:51:46 +01:00
Florian Schmaus
352e422562 Drop SM state *before* binding the resource 
as otherwise <bind/> and <session/> may be duplicated on reconnect.

Fixes SMACK-706.
 2015-12-03 13:47:08 +01:00
Florian Schmaus
3c74ef2fd2 Fix PubSub Affiliation getElementName() 
must return 'affiliation', not 'subscription'.

Fixes SMACK-705.
 2015-12-03 08:17:19 +01:00
Florian Schmaus
a5e9037907 Use contains(BareJid) instead of entries.containsKey in Roster 2015-12-01 18:08:54 +01:00
Florian Schmaus
3c2dd9b9e6 Improve javadoc of getIQChildElementBuilder() 2015-11-24 10:58:41 +01:00
David Black
3e924ff2bb Use https://dl.bintray.com/content/aalmiray/kordamp 
instead of http://dl.bintray.com/content/aalmiray/kordamp as a
configured maven repository.

Signed-off-by: David Black <dblack@atlassian.com>
 2015-11-22 23:24:04 +01:00
Florian Schmaus
eb1499696a Bump jxmpp to 0.5.0-alpha7 2015-11-22 23:18:46 +01:00
Florian Schmaus
8dcb3c11ff Smack 4.1.5 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQF8BAABCgBmBQJWUjTuXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQxMzU3QjAxODY1QjI1MDNDMTg0NTNEMjA4
 Q0FDMkE5Njc4NTQ4RTM1AAoJEIysKpZ4VI41zp8H/iRB0CtFvxVBFwRpP2HB0Iyc
 VzdxJTVXgJ7s8V3Us2Gmm0chUvs1wybshIdZ090NX7huZ4F1rWrOP7qt9S4soKgX
 LNdKTKTTNJ61jktLkG1HjA8yJr1Zu+XFK10Ne8997N9TnhbcVYAhsuTb8SRE8dlE
 G1Qihe2guJCCnWJhz9bsCXyAFt/fM5rSb/sgs/kXkE1W5bYeMHpFMvqMfab8NPBP
 fkt/NSxfqLfrRJneynnSwGSvRitDxpfRCcxLktTdDO31eryayIyiQIhaUhFYIGJQ
 tKx0/7HdCkgdUueBdtoQ/O02rjJ+kYqN2F3CErcIbB//3R6WKNF61XzOY81egYc=
 =dklO
 -----END PGP SIGNATURE-----

Merge tag '4.1.5'

Smack 4.1.5
 2015-11-22 23:14:02 +01:00
Florian Schmaus
fb6aaa073e Extend MucConfigFormManager and add javadoc 2015-11-22 22:47:10 +01:00
Florian Schmaus
19469b0faf Fix NPE in ChatManager: Check if null 
bareJidChats is a ConcurrentHashMap which does not allow 'null' keys,
thus get(null) returns a NPE. And asEntityBareJidIfPossible may return
'null', this could happen.
 2015-11-22 22:46:53 +01:00
Florian Schmaus
6739b74ff9 Smack 4.1.6-SNAPSHOT 2015-11-22 22:44:57 +01:00