vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-11-14 16:22:07 +01:00
Code Issues Releases Wiki Activity
3485 commits 61 branches 35 tags 39 MiB
Commit graph

3485 commits

This branch
This branch
All branches
Author SHA1 Message Date
Florian Schmaus
73dd46af21 Remove duplicate numbers from StringUtils.numbersAndLetters 
Fixes SMACK-784.
 2017-11-16 17:48:29 +01:00
Dmitry Deshevoy
4f11dc5b14 Drop stream management state on StreamManagementException 2017-11-16 19:10:52 +03:00
Florian Schmaus
0da3ebf385 Make MUC invitation rejected filter also filter by room address 
Fixes SMACK-783.
 2017-11-12 12:20:08 +01:00
Florian Schmaus
fe61922fb7
Merge pull request #179 from damencho/4.2 
Makes xmpperror descriptive text optional as said in the rfc.
 2017-11-09 18:26:14 +01:00
Florian Schmaus
a66c42834f Add findServicesDiscoveryInfo() variant 
which does not log some exceptions, but instead comes with an optional
output paramater which returns the encountered exceptions.
 2017-11-09 18:16:08 +01:00
Florian Schmaus
5ef6853db6 Improve MultiUserChat's leave() and destroy() login 
Remove the "if (!joined) return" guard in leave() this allows to
resync the instances state with the real world state in case they ever
get out of sync.

Also call userHasLeft() in even if leave() throws and in certain
situations if destroy() throws.

Thanks to Дамян Минков and Ingo Bauersachs for pointing this out.
 2017-11-07 20:38:19 +01:00
Florian Schmaus
0a4cd79d4e Call MultiUserChat.userHasLeft() before invoking listeners 
in case a listener throws, userHasLeft() will eventually have set the
MutliUserChat instance to the right state.
 2017-11-07 20:34:43 +01:00
Florian Schmaus
d93d214f0e Remove duplicate code in MultiUserChat 2017-11-07 20:34:43 +01:00
damencho
44e4607259 Fix memory leak in MutliUserChat.removeConnectionCallback(). 
Fix memory leak by removing subject listener
in MutliUserChat.removeConnectionCallback().
Fixes SMACK-782.
 2017-11-07 20:34:43 +01:00
Florian Schmaus
65b4f506dc Add SubscribeAnswer.ApproveAndAlsoRequestIfRequired 2017-11-06 22:41:28 +01:00
Florian Schmaus
9a34e9e870 Add RosterUtil.preApproveSubscriptionIfRequiredAndPossible() 2017-11-06 22:39:10 +01:00
Florian Schmaus
92825020ab Update README.md 2017-10-29 09:11:26 +01:00
Florian Schmaus
752584fbed
Merge pull request #180 from thakkaryash94/master 
Updated help links
 2017-10-29 08:10:31 +01:00
Yash Thakkar
044d1f0857
Updated help links 
replaced community links to discourse links
 2017-10-29 05:19:46 +05:30
Florian Schmaus
1d52a0c8ef Don't let smack-android depend on smack-omemo(-signal) 
Fixes SMACK-779.
 2017-10-27 20:54:06 +02:00
damencho
a0b0b5a63b Makes xmpperror descriptive text optional as said in the rfc. 2017-10-27 13:14:50 -05:00
Florian Schmaus
1b2521269e Make END_TAG parsing more NPE robust 
by calling String.equals() on the constant string and not on the
return value of parser.getName().

Also perform the access to 'parser' on a different LOC than
equals(). This should help debugging things like

okt 25, 2017 2:02:54 PM org.jivesoftware.smack.AbstractXMPPConnection callConnectionClosedOnErrorListener
WARNING: Connection XMPPTCPConnection[***@***/***] (0) closed with error
java.lang.NullPointerException
	at org.jivesoftware.smack.tcp.XMPPTCPConnection$PacketReader.parsePackets(XMPPTCPConnection.java:1194)
	at org.jivesoftware.smack.tcp.XMPPTCPConnection$PacketReader.access$300(XMPPTCPConnection.java:982)
	at org.jivesoftware.smack.tcp.XMPPTCPConnection$PacketReader$1.run(XMPPTCPConnection.java:998)
	at java.lang.Thread.run(Thread.java:745)

which where recently reported on the forums.
 2017-10-27 17:48:00 +02:00
Florian Schmaus
384c285fbc Merge branch '4.2' 2017-10-14 14:56:36 +02:00
Florian Schmaus
0729392ab8 Fix isSupported discovery of "Push Notifications" 
Fixes SMACK-780.
 2017-10-14 14:12:28 +02:00
Florian Schmaus
e1e12031ac REPL: Add support to enable a JDWP debug link 2017-10-14 13:38:24 +02:00
Florian Schmaus
01aa6d9c18 DNS: Correctly handle broken SRV records 
where the SRV RR points to a target DNS name with no associated A or
AAAA RRs.

Fixes SMACK-781.
 2017-10-14 13:29:46 +02:00
Florian Schmaus
122bf06ccc Merge pull request #160 from ibauersachs/parse-error-texts 
Get descriptive text from error without lang
 2017-09-29 19:04:14 +02:00
Florian Schmaus
221671f9c5 Merge branch 'master' of github.com:igniterealtime/Smack 2017-09-29 17:36:08 +02:00
Florian Schmaus
e85dfa6d6b Add smack-logo-plain-minimized.svg using scour 
Scour: https://github.com/scour-project/scour
 2017-09-29 17:18:42 +02:00
Florian Schmaus
62b84adbd5 Add Makefile for Smack logo PNGs 2017-09-29 17:03:47 +02:00
Florian Schmaus
ed606a86b2 Resize smack-logo-plain.svg to content 2017-09-29 16:53:12 +02:00
Florian Schmaus
c70a1921db Use Async.go() in OMEMO PEPListener 
to avoid a deadlock, since the PEP listener is synchronous.
 2017-09-29 16:32:32 +02:00
Florian Schmaus
58181bab08 OMEMO: Unspaghetti PEP listener code 
While I like Spaghetti, I don't like them in my code.

4 insertions, 24 deletions, *kaboom*. :)
 2017-09-29 16:32:32 +02:00
Florian Schmaus
941f29e928 Improve ReconnectionManager 
Fixes SMACK-778.
 2017-09-29 16:32:32 +02:00
Ingo Bauersachs
699145ee5f Get descriptive text from error without lang 
A stanza with <error><text>Some text</text></error>, i.e. without a
xml:lang attribute, did not return the value 'Some text' in
getDescriptiveText().

Insert the empty string as key when the attribute is not present while
parsing the xml. When writing, omit the attribute if the key is the
empty string.
 2017-09-27 00:21:40 +02:00
Florian Schmaus
ff1ab051f5 Merge pull request #174 from thakkaryash94/patch-1 
Missing comma between password and serviceName
 2017-09-25 15:07:18 +02:00
Yash Thakkar
efa3f123f9 Missing comma between password and serviceName 2017-09-24 15:00:43 +05:30
Guus der Kinderen
5070b79968 Fixed typo. 2017-09-15 22:28:30 +02:00
Florian Schmaus
255865f733 Add XmlUtil.prettyFormatXml() 2017-09-10 16:46:26 +02:00
Florian Schmaus
1d943aed20 Merge pull request #173 from iachimoe/4.2 
Updated comments to indicate that reject_all is default SubscriptionMode
 2017-08-26 19:50:49 +02:00
iachimoe
c92a95136f Updated comments to indicate that reject_all is default SubscriptionMode 2017-08-26 12:16:07 -05:00
Florian Schmaus
8020fc1416 Make IQRequestHandler the only option to handle IQ requests 
Previously StanzaListeners and Collectors where able to receive IQ of
type 'get' or 'set' (i.e., IQ requests) when no IQRequestHandler was
registered. By moving the 'return' statement one level down, even
listeners/collectors won't receive them.
 2017-08-16 21:06:23 +02:00
Florian Schmaus
9bb0ed150b Merge pull request #165 from pocman/patch-1 
Keep 4.1.9 chat.sendMessage(String) behavior
 2017-08-16 15:18:52 +02:00
Florian Schmaus
2a97d7c5ea Don't reinvent methods in HashManager 
use the existing API from StringUtils instead.

Also rename StringUtils.toBytes() to 'toUtf8Bytes()'.
 2017-08-16 14:55:25 +02:00
Florian Schmaus
6565618840 Encode algorithm recommendation in HashManager 2017-08-16 14:38:22 +02:00
Florian Schmaus
ba323b51f9 Remove API parts scheduled to be removed in Smack 4.3 2017-08-16 14:31:46 +02:00
Florian Schmaus
80eaaf2d71 Fix warnings 2017-08-16 14:10:00 +02:00
Florian Schmaus
6203d163c4 Deprecate old async API 2017-08-16 13:46:42 +02:00
Florian Schmaus
798d158d32 Make SmackFuture.getOrThrow() throw InterruptedException 2017-08-16 13:45:51 +02:00
Florian Schmaus
339ae1c7a0 Merge pull request #163 from ibauersachs/replymode-public 
Make UnknownIqRequestReplyMode public
 2017-08-14 22:57:28 +02:00
Florian Schmaus
997766533f Merge pull request #161 from ibauersachs/condition-to-type-mappings 
Make XMPPError Condition to Type mapping consistent
 2017-08-14 22:57:12 +02:00
Florian Schmaus
6653638e77 Merge pull request #167 from ibauersachs/fix-javadoc-indentation 
Fix too shorts indents of two Javadoc comments
 2017-08-14 22:56:30 +02:00
Ingo Bauersachs
25114b3fc1 Add a test to ensure all Conditions have a Type mapping 2017-08-14 21:50:30 +02:00
Ingo Bauersachs
b7542bbde5 Fix too shorts indents of two Javadoc comments 2017-08-14 21:47:53 +02:00
Ingo Bauersachs
47c936e508 Make UnknownIqRequestReplyMode public 
If it is not made public, then (g|s)etUnknownIqRequestReplyMode cannot
be used.
 2017-08-14 21:45:29 +02:00