1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-15 03:52:05 +01:00
Commit graph

3693 commits

Author SHA1 Message Date
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
Florian Schmaus
24f6d86452 Fix typo: s/ProsoydWorkaround/ProsodyWorkaround/ 2017-04-19 12:23:17 +02:00
Florian Schmaus
ddf888e607 Do not return null in getLeafNodeProsodyWorkaround
and rethrow the original exception.
2017-04-19 12:21:04 +02:00
Florian Schmaus
bfab3ec578 PubSubManager.getLeafNode(): Actually employ the prosody workaround 2017-04-19 11:50:01 +02:00
Florian Schmaus
e6a51f2151 Add PubSubManager.getLeafNode() and improve prosody workaround
by using the protected constructor and not reflection.
2017-04-19 11:46:39 +02:00
Florian Schmaus
7cc9e9ffcc Merge pull request #123 from vanitasvitae/4.2getOrCreateLeafNode
Fix getOrCreateLeafNode for Prosody
2017-04-19 11:45:59 +02:00
10927577ad
Fix getOrCreateLeafNode for prosody 2017-04-19 11:34:47 +02:00
Florian Schmaus
edf0bd4038 Update README: Add Documentation and Javadoc link 2017-04-09 13:09:48 +02:00
Florian Schmaus
d421b2fa1b Fix provided SASL DIGEST-MD5 mechanism
In case the server provided nonce contained one or more equals
characters ("=") the part.split("=") call would return more then the
expected two key/value parts. Hence we simply use part.split("=", 2).

Also made the unit test check for this case.

Fixes SMACK-755
2017-04-07 19:06:55 +02:00
Florian Schmaus
c636e72a9d Change behavior of send()/publish() in LeafNode
Previously publish() was "asynchronously" in that sense that the response
of the IQ as *not* awaited, and send() would wait for the
responses. It makes no sense to have that functionality this way.

Instead we now make publish() to the right thing, i.e., wait for an IQ
result, make send() a proxy for publish(), and mark send() deprecated.

In the future, there may be a publishAsync() method which returns a
Future instance.
2017-04-06 15:11:04 +02:00
Florian Schmaus
16ede9806a Add PubSubManaer.supportsAutomaticNodeCreation() 2017-04-06 12:32:34 +02:00
Florian Schmaus
e73cef8000 Add PubSubManager.tryToPublishAndPossibleAutoCreate(String, I) 2017-04-06 10:14:54 +02:00
Florian Schmaus
8466a5af1a Improve MUCs subject changed notification filter
Filter also messages with bodies or thread element.
2017-04-04 14:27:11 +02:00
Florian Schmaus
a887cde1ce Allow MUC room subject changes from the MUCs bare JID
Fixes SMACK-754.
2017-04-04 14:08:19 +02:00
Florian Schmaus
e6787b21ce Merge pull request #122 from andrisasuke/fix-enable-push-formtype
Fix enable push notification IQ form type
2017-04-03 15:07:29 +02:00
andri.khrisharyadi
c8b4df4f84 Fix EnablePushNotificationsIQ wrong form type
Should be submit instead of form
Fixes SMACK-752
2017-04-03 18:59:14 +07:00
Florian Schmaus
c8e7c4804b Merge pull request #120 from cemyabansu/patch-1
Documentation fix: setPort() accepts int not String
2017-03-30 10:43:25 +02:00
Cem Yabansu
430cfa0ec5 setPort accept integer only
changed string to int. setPort function is only accepting integer.
2017-03-27 18:00:38 +03:00
8a8c01a4e5 Fix AbstractError.getDescriptiveText() 2017-03-20 16:57:06 +01:00