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

461 commits

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
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
bcdfb5398a Fix EntityTimeManager.getTime(): Set recipient JID 
Fixes SMACK-716
 2016-02-17 09:13:06 +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
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
89bd13318a Fix typo in CapsExtensionProvider: s/elment/element/ 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
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
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
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
fb6aaa073e Extend MucConfigFormManager and add javadoc 2015-11-22 22:47:10 +01:00
Florian Schmaus
b849d4102b Allow for multiple 'null' fields in DataForm 2015-11-20 17:39:02 +01:00
Florian Schmaus
b746e5caee Add support for MUC Item Actor 'nick' 
Fixes SMACK-691.
 2015-09-29 22:28:26 +02:00
Florian Schmaus
f0f655c779 Javadoc fixes in MultiUserChat 2015-09-28 11:16:02 +02:00
Florian Schmaus
194717d75b Merge branch '4.1' 2015-09-26 12:43:27 +02:00
Florian Schmaus
9c694a0a75 Code cleanup: Fix some warnings 2015-09-24 12:59:17 +02:00
Florian Schmaus
15c1c8ad19 Fix Time class creating invalid XML 
Fixes SMACK-698.
 2015-09-24 09:38:48 +02:00
Florian Schmaus
a00331dbb4 Fix javadoc of MucEnterConfiguration 2015-09-18 23:47:30 +02:00
Florian Schmaus
04a0004035 Smack 4.1.4 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQF8BAABCgBmBQJV9nAlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQxMzU3QjAxODY1QjI1MDNDMTg0NTNEMjA4
 Q0FDMkE5Njc4NTQ4RTM1AAoJEIysKpZ4VI41sFEIAJlfRspk6S5ymNc4w7u/FT1w
 MpHT/cxqIQIBU9J5dYqeW6Y8O6VuUeknCmZBEv7dIVHroTmvfosMauAyRZJXWeeL
 FQQTBqDJszYdM88x/d5X6d25lCEBdQkdDh2a5s9AIy9RH0iXE74AypuikbroK+VC
 zI3wRPUFq7WnARtmiP2NalSgSNv5ToeicBO+JSniQ+O52ZAlP2FSDfi4uzPPigdP
 Ip/V3eF4Bp0YZimcxAnWdnMU+ciVLClRYKgD3+qTEoic7dx3dzeTyrk1NoLRgQl9
 mfcNXBgUScHZAoSIkR0QiUx9ktPCJ950qa+XtW3B8NtDOZkXegUL/a8ukQAuz+k=
 =qMsC
 -----END PGP SIGNATURE-----

Merge tag '4.1.4'

Smack 4.1.4
 2015-09-14 09:05:24 +02:00
Florian Schmaus
d728204890 Add errorprone check and fix found errors 
Adds gradle-errorprone-plugin 0.0.8, requires Gradle 2.6.
 2015-09-13 18:12:33 +02:00
Florian Schmaus
aa832ec1f0 Handle cases where no privacy lists are set. 
The is when no default or active list is, then don't perform a privacy
list request where list name is 'null'.

Fixes SMACK-697.
 2015-09-04 11:22:52 +02:00
Florian Schmaus
7b1b20a13c Use Localpart in AccountManager 2015-08-20 19:01:33 +02:00
Florian Schmaus
6b7f69b42f Fix MUCs UserStatusListener 
use oldPresence instead of packet. This bug was introduced with
e6aa2416e4.

Fixes SMACK-693.
 2015-08-17 18:20:35 +02:00
Florian Schmaus
ef8fa1fa46 Fix MUCRole and MUCAffiliation equal checks in MultiUserChat 2015-08-17 12:52:38 +02:00
Florian Schmaus
33e5c37af8 Refactor PEP to use PubSub API. 
Fixes SMACK-416.
 2015-08-17 12:45:23 +02:00
Florian Schmaus
d711caee38 Use EntityFullJid in MUC's getOccupant(Presence) API 
instead of String, which will always return null if used with
ocupantsMap.get(String), because String.equals(Object) is only true if
Object is also instanceof String.

Thanks to Adnan Elezovic for reporting.
 2015-08-12 10:22:11 +02:00
Vaibhav
3bbffeae28 Make abstract package protected methods in PEPItem public 
Fixes SMACK-372
 2015-07-31 13:37:35 +02:00
Florian Schmaus
e0e4fd9b12 Add checkstyle rule for StringBuilder.append(char) 
And replace all instances where String.Builder.append() is called with a
String of length one with append(char).

Also adds StringUtils.toStringBuilder(Collection, String).
 2015-07-27 19:02:11 +02:00
Florian Schmaus
19ebcb814b Check that service is MUC service in getHostedRooms() 
and otherwhise throw a NotAMucServiceException.
 2015-07-17 09:08:04 +02:00
Florian Schmaus
2e03f0f3f3 Improve HostedRoom API 
return EntityBareJid instead of Jid.
 2015-07-17 09:06:40 +02:00
Florian Schmaus
24365f0f1e Fix MultiUserChat javadoc 2015-07-15 22:37:49 +02:00
Florian Schmaus
ea00caca31 Fix MultiUserChat.enter() 'nickname' check 
It's no longer necessary to check if 'nickname' is set. The
MucEnterConfiguration API already enforces that.
 2015-07-15 22:36:10 +02:00
Florian Schmaus
1c716bc1e0 Smack 4.1.3 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQF8BAABCgBmBQJVpgWiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQxMzU3QjAxODY1QjI1MDNDMTg0NTNEMjA4
 Q0FDMkE5Njc4NTQ4RTM1AAoJEIysKpZ4VI41G1gH+gIw/seXSSY6vYlVkYEFtR+e
 LV/LArN/eN1ZGc+WjN0EysRyqOBqF8HVHuyO7fF67huDRn62s7hufVY//NTctJ5L
 m4TXwaEUvgjdul7vm/dZcNRYr0jcSpDTFWx2egkOXt3qE9AhnpbnaIJ5c3q9VVVD
 aba88c3NS7quxp0hQm1SNEAmt1CCMPom7YkxdIPKWlLj8N5AF1UuSKwckLLYSUlS
 wloBbITb6EjI1IwszhN6e6o3W+7Pz/1zbFjk0CkKUS+TmhHhKil8TonH8Se/9DYD
 1SVHxvZa8LHWsU9G/R1Nhl69K2+GHEUbGmXalFmyPIf5ifhYyNimpx9krXQUuLs=
 =3/cn
 -----END PGP SIGNATURE-----

Merge tag '4.1.3'

Smack 4.1.3
 2015-07-15 09:37:46 +02:00
Florian Schmaus
57cc3aa3f8 Add MucEnterConfiguration API 
Allows to configure the presence used when joining a MUC.

Part of SMACK-648: Improve the MUC API.
 2015-07-07 08:52:33 +02:00
Florian Schmaus
a9741a8b10 Use weak map for 'managers' in Socks5BytestreamManager 
Fixes memory leak and SMACK-678.
 2015-06-29 17:07:42 +02:00
Florian Schmaus
ebcbdb75cd Smack 4.1.2 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQF8BAABCgBmBQJVjpgTXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQxMzU3QjAxODY1QjI1MDNDMTg0NTNEMjA4
 Q0FDMkE5Njc4NTQ4RTM1AAoJEIysKpZ4VI41g0IH/3dJedDe6D8BySl4YVoFkQEk
 Ax6T9oguTHN4o+6wnIjZUMBqycxKbwCppwE8ydrsarpxBicehwLzgaegxqVOtqM/
 /7ZNzMiASxzeSCOQpR6dxNYGZp/buY3yaL4hweVh8V+vRVxzk/dXBpl6Syba+G1N
 ytpCfeC6bGd+Gf5aQ9SA8rPz3ZP99twFNuKYwZGkC8/ePtieT8YthKwwnaIlCuFL
 BZbhgR24W5pDtaCocTBUnI2wTqv2WsEx6+6LNEHsg2pbAwf2hYw12LPk0krvZOOV
 PSK/Jtq5qdXrq/vNudvfuVmk5KnhS8BO/WIY+8+EsYBFfP0W7ajZl69KGOxobNQ=
 =dg39
 -----END PGP SIGNATURE-----

Merge tag '4.1.2'

Smack 4.1.2

Conflicts:
	version.gradle
 2015-06-27 15:07:04 +02:00
Florian Schmaus
4d7279d036 Improve PubSubNamespace 2015-06-06 17:44:08 +02:00
Florian Schmaus
fce0aeadef Add support for PubSub affiliation actions as owner 
SMACK-675.
 2015-06-06 17:38:59 +02:00
Florian Schmaus
f7782aa466 Extend PubSub Affiliation class by 'jid' 
to allow pubsub#owner affiliation operations. SMACK-674.
 2015-06-06 17:38:55 +02:00
Florian Schmaus
58402c5615 Bump jxmpp to 0.5.0-alpha5 and change Roster API 
to only allow bare JIDs as roster entires.
 2015-06-06 11:16:12 +02:00
Florian Schmaus
2f219c7317 Rename processPacket to processStanza 
and assert that 'stanza' is a Stanza.
 2015-06-05 14:04:17 +02:00
Florian Schmaus
c1192f18b4 Add support for vCard PREFIX and SUFFIX elements 
SMACK-673
 2015-06-04 22:29:36 +02:00
Florian Schmaus
1cd268a8f0 Deprecate Forwarded.getForwardedPacket() 2015-06-02 17:30:57 +02:00
Florian Schmaus
9a00e09c0a Improve NoResponseException messages 2015-06-02 17:30:57 +02:00
Florian Schmaus
c125a3b055 Bump jxmpp to 0.5.0-alpha4 2015-05-27 19:29:51 +02:00
Florian Schmaus
01f08e87c2 Merge branch '4.1' 
Conflicts:
	smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java
	version.gradle
 2015-05-24 22:36:11 +02:00
Florian Schmaus
35317a19bd Remove ConnectionListener from Socks5BytestreamManager 
and use weak references.

Disabling the Socks5Manager every time the connection is terminated, and
re-enabling it when it got connected again causes unwanted side
effects. Like adding a new feature to the ServiceDiscoveryManager causes
an update of the entity's capabilities, which then triggers a new outgoing
presence (announcing the new caps version).

SMACK-671
 2015-05-24 22:33:26 +02:00
Florian Schmaus
385798f9ba Only add Entity Capabilities extension to available presences 
Also don't override eventually send presences on
updateLocalEntityCaps(), instead save the last sent Presence stanza and
re-send that stanza.

SMACK-669.
 2015-05-22 08:45:53 +02:00
Florian Schmaus
f369a009ac Rename 'serviceName' to 'xmppServiceDomain' 
Also use 'null' as default value for the resource, to enforce server
generated resources.

Fixes Smack-665
 2015-05-19 09:26:59 +02:00
Florian Schmaus
001e824fb9 Improve PubSub API 
Use Manager pattern for PubSubManager.

Also improve the API of ServiceDiscoverManager.
 2015-05-12 17:56:06 +02:00
Florian Schmaus
9e351f0535 s/MucConfigurationNotSupported/MucConfigurationNotSupportedException/ 2015-05-12 11:56:03 +02:00
Florian Schmaus
ff72ea320c Check if MUC room is hosted on a MUC service 
when trying to enter a room.
 2015-05-12 11:54:54 +02:00
Florian Schmaus
bbc7aaae77 Smack 4.1.1 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQF8BAABCgBmBQJVTgmuXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQxMzU3QjAxODY1QjI1MDNDMTg0NTNEMjA4
 Q0FDMkE5Njc4NTQ4RTM1AAoJEIysKpZ4VI41MXUH/3A5Jc6rzALhnXMT4yj+jXow
 rLLX5/ypOvkAXEMRlTf9xd2apz4hT8dMsBcL3JvZscuVmkw0/woh9eV/PFSDoc7t
 HA7bMZRqWqUuVOezFD0ggHsJ7zfpcIuxsgoNARQlCRMPHzCLzKhMNctz5UApAdfy
 +wPpTMpc3K5SM1bNlM60qp+dbPCqQcLwYP02KrOQASgenVDm6iKFpzx0ieVpPY1M
 hOBMyaZg3n2j+267gpqBG6c7PVmEq3deAlB6BOBAsL/Bp1w5B5Smq959LWJLstrU
 /LeYJFi1TeIASiFy1vZyTV0Tw+Pe++3gB6ppLqkQhfWV8vXzm0coCXx29qWxAzM=
 =pGJt
 -----END PGP SIGNATURE-----

Merge tag '4.1.1'

Smack 4.1.1

Conflicts:
	smack-extensions/src/main/java/org/jivesoftware/smackx/caps/provider/CapsExtensionProvider.java
	smack-im/src/main/java/org/jivesoftware/smack/roster/RosterEntry.java
	smack-java7/src/main/java/org/jivesoftware/smack/java7/Java7SmackInitializer.java
	version.gradle
 2015-05-09 15:42:09 +02:00
Florian Schmaus
236dfb009d Improve logging of parsing errors 2015-05-07 22:40:38 +02:00
Florian Schmaus
fcc62ad131 Add support for MUC roomnick rewrite 
SMACK-646
 2015-04-23 23:11:40 +02:00
Florian Schmaus
5af4f1a5d1 Synchronize MultiUserchat.changeNickname(Resourcepart) 2015-04-23 21:45:33 +02:00
Florian Schmaus
475fed8c51 Fix DeliveryReceiptsManager.autoAddDeliveryReceiptRequests 
Must use interceptors instead of sending listeners, as those are
invoked *after* the stanza has been put on the wire. Also use the
correct filter, which excludes ack messages.

Fixes SMACK-656.
 2015-04-23 21:31:09 +02:00
Florian Schmaus
17103def0b Change SmackExecutorthreadFactory constructor parameter to XMPPConnection 2015-04-22 09:45:02 +02:00
Florian Schmaus
f274581c27 Add MucBookmarkAutojoinManager 
Also add MucConfigFormManager and improve the MUC API (SMACK-648). Bump
to jxmpp 0.5.0-alpha3.

Improve and extend PrivateDataManager and BookmarkManager.
 2015-04-21 19:31:10 +02:00
Florian Schmaus
265e5c69d5 Use LinkedHashMap for form fields 
for efficient lookup.
 2015-04-12 19:27:22 +02:00
Florian Schmaus
4a16ab9329 Merge branch '4.1' 
Conflicts:
	version.gradle
 2015-04-12 18:32:55 +02:00
Florian Schmaus
00ba5ae3df Replace PrivateDatamanager.getProviderKey with JXMPP method 2015-04-12 18:24:52 +02:00
Florian Schmaus
062e9ee415 Fix javadoc of pubsub.Item 2015-04-12 18:13:19 +02:00
TheHaf
a53894a65b Fix typo in exception 2015-04-09 21:16:05 +02:00
Florian Schmaus
b4694ec152 Add FinalClass checkstyle check 
And mark affected classes final.
 2015-04-06 10:45:12 +02:00
Florian Schmaus
0a6ac76447 Remove package-info.java from test packages 
as otherwhise eclipse will complain "The type package-info is already
defined".
 2015-04-05 10:48:00 +02:00
Florian Schmaus
de528eee67 Add JavadocPackage checkstyle 
change from package.html to package-info.java. Add missing
package-info.java with a placeholder description.
 2015-04-04 17:16:47 +02:00
Florian Schmaus
dc373f641c Make Smack Java8's javac and javadoc ready 2015-04-04 17:16:27 +02:00
Vyacheslav Blinov
cf2027fce7 Fix XEP-0080 geoloc extensions elements formating 
XEP-0080 states that lon,lat,error,alt,accuracy,bearing and speed are
decimal values, and thus should either be present as decimal, or not present
at all (as they are optional elements).
Usage of String.valueOf(value) in code lead to creating a "null"
string in case number was not present, thus creating an element with
"null" content, which is not a valid decimal value.
 2015-04-01 10:45:33 +02:00
Florian Schmaus
64d134052d Enable javadoc checkstyle 
and fix violations.
 2015-03-29 12:29:32 +02:00
Florian Schmaus
6a5637c2e4 Add JivePropertiesExtension.from(Message) 2015-03-25 10:29:43 +01:00
Florian Schmaus
e1cb837489 Make FileTransferNegotiatorTest extends InitExtensions 2015-03-25 10:29:43 +01:00
Florian Schmaus
0897b76718 Fix unit-tests initialization 
Remove the TestSuite class. We now have

SmackTestSuite
    ^
	|
InitExtensions
    ^
	|
$UnitTest

where most basic setup is done in a static block within
SmackTestSuite (only stringencoder setup right now).

Also some minor fixes in unit tests.
 2015-03-24 21:40:08 +01:00
Florian Schmaus
c6594aec2f Lint fixes: Remove dead code, etc. 
- make method static when possible
- remove never thrown Exception declarations
- other fixes
 2015-03-24 18:33:47 +01:00
Florian Schmaus
83b84c5bd3 Merge branch '4.1' 
Conflicts:
	smack-core/src/main/java/org/jivesoftware/smack/StanzaListener.java
	smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java
	smack-core/src/main/java/org/jivesoftware/smack/packet/Stanza.java
	smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java
	version.gradle
 2015-03-24 17:16:18 +01:00
Florian Schmaus
9ac3633612 javadoc: s/packet/stanza/ 2015-03-24 17:15:50 +01:00
Florian Schmaus
164b7c6690 Set localNodeVer after currentCapsVersion is set 2015-03-24 12:05:56 +01:00
Florian Schmaus
49c2c35609 Synchronize SDM methods that change the state 
Other Managers, e.g. EntityCapsManager, may be notified if e.g. a
feature is added or removed. While they are notified, the state of SDM
must be consistent, therefore synchronize SDM methods that modify the
state.
 2015-03-24 11:59:35 +01:00
Florian Schmaus
130a8216d1 EntityCapsManager must not use CapsVersionAndHash.toString() 
as it would return Object.toString(). Instead the entity version string
was required. Use getLocalNodeVer() instead.
 2015-03-24 11:59:31 +01:00
Florian Schmaus
451eb4c826 Add missing break statements 2015-03-23 09:52:01 +01:00
Florian Schmaus
f546d28ad8 Xlint all the things 
and fix all warnings.
 2015-03-23 09:28:49 +01:00
Florian Schmaus
5e86db4f80 Substitute 'packet' with 'stanza(/packet)' in javadoc 2015-03-21 09:36:28 +01:00
Florian Schmaus
0ca4e8b72a Add EntityCapsManager to startup classes 2015-03-18 22:05:26 +01:00
Florian Schmaus
5188c6f934 Add checkstyle check for space(s) after tab(s) 2015-03-18 21:51:25 +01:00
Florian Schmaus
8878cf3773 Add checkstyle check for trailing whitespace 2015-03-18 21:01:49 +01:00
Florian Schmaus
b8f046706b Add Integration Test Framework 
and resurrect a few integration tests.
 2015-03-18 11:09:56 +01:00
Florian Schmaus
b2221d5483 Add more checkstyle tests 
- Lines containing tab(s) after space
- Usage of printStackTrace
- Usage of println
- Add SupressionCommentFilter module

SuppressionCommentFilter can be enabled with
// CHECKSTYLE:OFF
and disabled with
// CHECKSTYLE:ON
 2015-03-17 22:02:44 +01:00
Florian Schmaus
0fde39fa45 's;^\s+$;;' on all source files 
And add checkstyle test for lines containing only whitespace characters.
 2015-03-17 11:33:02 +01:00
meisterfuu
05c97c494b Add roomDestroyed callback to MUC UserStatusListener 
Fixes SMACK-619
 2015-03-17 09:51:20 +01:00
Ishan Khanna
0d8f3185e5 Add Support for XEP-80: User Location 
SMACK-610
 2015-03-16 20:01:58 +01:00
Florian Schmaus
bc093b620d Make Provider.parse() just throw Exception 
instead of throwing XmlPullParserException, IOException and
SmackException.

Add a guard to AbstractXMPPConnection.processPacket() to always re-throw
RuntimeExceptions.
 2015-03-13 09:27:18 +01:00
Florian Schmaus
41b74ec13c Immutable objects must not implemented TypedCloneable 
also add a note about that to the developers documentation.
 2015-03-12 13:12:39 +01:00
Florian Schmaus
516e397679 Improve MUC's Destroy element class 
- Made jid of type BareJid
- Made it implement TypedCloneable
- Made it implement Serializable
- Made it immutable

Also update its parsing code. And add some convenience methods to
ParserUtils.
 2015-03-11 21:31:37 +01:00
Florian Schmaus
369878b6d9 Merge branch '4.1' 
Conflicts:
	version.gradle
 2015-03-11 20:51:08 +01:00
Florian Schmaus
f6ba363843 Always include role in MUCItem if it's set 
As not including "role='none'" when kicking a user will result in an
XMPPErrorException. Also there appears to be nothing in XEP-45 which
says "if role is not set, then it defaults to 'none'".
 2015-03-11 12:36:15 +01:00
Florian Schmaus
e85c1881d7 Add TypedCloneable 2015-03-10 22:50:48 +01:00
Florian Schmaus
429af3b642 Add VersionManager to startupClasses 2015-03-10 13:51:04 +01:00
Florian Schmaus
d389b4db20 Fix NPE in EntityCapsManager 
persistentCache may be null.
 2015-03-10 13:22:48 +01:00
Florian Schmaus
c540ac9703 Merge Smack 4.1.0-rc3 
Conflicts:
	smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/provider/BytestreamsProvider.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java
	version.gradle
 2015-03-07 21:31:56 +01:00
Florian Schmaus
a95d25544c Improve EmbeddedPacketExtension javadoc 
parsePacketExtension is deprecated, use parseExtensionElement instead.
 2015-03-07 21:12:42 +01:00
Florian Schmaus
48aae12ba3 Remove XMPPException from MultiUserChat.sendMessage 
as it's not actually thrown.
 2015-03-07 20:52:44 +01:00
Florian Schmaus
2db5ebb4b7 Fix BytestreamsProvider: Mode is optional 
and defaults to TCP.
 2015-03-07 20:51:23 +01:00
Florian Schmaus
701aa7d9c4 Merge branch '4.1' 
Conflicts:
	smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java
	smack-core/src/main/java/org/jivesoftware/smack/PacketCollector.java
	smack-core/src/main/java/org/jivesoftware/smack/PacketListener.java
	smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java
	smack-core/src/main/java/org/jivesoftware/smack/debugger/SmackDebugger.java
	smack-core/src/main/java/org/jivesoftware/smack/packet/Packet.java
	smack-core/src/main/java/org/jivesoftware/smack/util/XmlStringBuilder.java
	smack-core/src/test/java/org/jivesoftware/smack/ThreadedDummyConnection.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/address/provider/MultipleAddressesProvider.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/DataListener.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FaultTolerantNegotiator.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/IBBTransferNegotiator.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/Socks5TransferNegotiator.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/StreamNegotiator.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/LeafNode.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Node.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubManager.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/packet/PubSub.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/VCardManager.java
	smack-extensions/src/test/java/org/jivesoftware/smackx/receipts/DeliveryReceiptTest.java
	smack-im/src/main/java/org/jivesoftware/smack/chat/ChatManager.java
	smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSession.java
	smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleProvider.java
	smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/UserID.java
	smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/provider/RosterExchangeProvider.java
	smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java
	version.gradle
 2015-03-04 22:42:36 +01:00
Florian Schmaus
ed4fa3390f Add XMPPConnection.sendStanza(Stanza) 
and deprecate sendPacket().
 2015-03-04 21:46:44 +01:00
Florian Schmaus
183af99ffb DeliveryReceipt helper methods take Message as argument 
Since it makes only sense for messages to have delivery receipts.
 2015-03-04 21:46:40 +01:00
Florian Schmaus
b813e3aa9e Return delivery receipts with the same type as the request 
Message delivery receipts now use the same message type as the
corresponding message with the delivery receipt request.
 2015-03-04 15:26:20 +01:00
Florian Schmaus
18d9be0099 Add CapsExtensionProviderTest 2015-03-04 13:08:35 +01:00
Florian Schmaus
85a9b07230 Fix MUC participantStatusListeners 
Thanks to Anno van Vliet for reporting the issue and proposing the fix.
 2015-03-03 17:11:42 +01:00
Florian Schmaus
50cf7f42f3 DataListener is no longer a StanzaListener 
it's just an IqRequestHandler. So remove the previous code related to it
being a stanza listener.
 2015-03-02 16:17:52 +01:00
Anno van Vliet
63fabf78ed Fixed Data IQ packet receiving 
Data packets where not received by the InBandByteStream due to a missing
IQRequestHandler

Conflicts:
	smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/DataListener.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSession.java
 2015-03-02 16:17:52 +01:00
Florian Schmaus
dde0cfd7f6 Fix incoming file transfers 
With bb8dcc9874 the concept if IQ request
handlers was introduced in Smack. This doesn't allow packet/stanza
collectors/listeners to filter for incoming IQ requests. Unfortunately
the file transfer code relied on this being able, so it broke with the
change.

There were two places where the file transfer code was listening for
incoming IQ requests:
- InitationListener(s)
- Negotiator(s)

With this change, we let the InitiationListener signal the existence of
an incoming initation request, send by an IQ of type 'set', using the
newly created EventManager utility.

The negotiator waits for those events to arrive and proceedes as it would
have done when the packet collector was used.
 2015-03-02 15:56:26 +01:00
Florian Schmaus
75ec271c6c Rename PacketListener to StanzaListener 
and add the PacketListener as deprecated interface.
 2015-03-02 15:49:56 +01:00
Florian Schmaus
d4a6d8e653 Rename PacketFilter (and implementing classes) and PacketExtension 
to StanzaFilter and ExtensionElement.
 2015-02-28 13:49:38 +01:00
Florian Schmaus
2250ac20ed Make VCard XML null value safe 
The user is able to set (most) values to null. We must take that into
consideration when transforming the VCard to XML.
 2015-02-26 08:56:08 +01:00
Florian Schmaus
404b90054b Use Executors.newSingleThreadScheduledExecutor 
and remove the calls to setMaximumPoolSize() and steKeepAliveTime()
since they are ineffective on Android.
 2015-02-25 16:17:09 +01:00
Florian Schmaus
9006ccf291 Fix VCardManager.saveVCard(VCard) 
In case the users tries to save a VCard he previously retrieved via
loadVCard() this would previously fail, as the 'to' address is set to
the clients full JID.
 2015-02-23 22:39:40 +01:00
Florian Schmaus
fbf0ba13ce Merge Smack 4.1.0-rc2 
Conflicts:
	smack-core/src/main/java/org/jivesoftware/smack/filter/FromMatchesFilter.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/AccountManager.java
	version.gradle
 2015-02-21 18:07:45 +01:00
Florian Schmaus
29bda59617 Log warning if account creation over insecure connection 
Prepare for SMACK-644.
 2015-02-21 16:57:16 +01:00
Florian Schmaus
19f96d2c40 Avoid duplicate provider lookup in ItemProvider 
This also fixes a programming error, since it could be possible that the
provider was removed between the lookup and the usage.
 2015-02-20 12:27:54 +01:00
Florian Schmaus
7ebea7ce94 Add StanzaIdFilter, deprecate PacketIDFilter 2015-02-19 16:07:42 +01:00
Florian Schmaus
887c6114b7 Add filter information to NoResponseException 
in order to aid debugging errors. This made it necessary to override
'toString()' for all filters in Smack.
 2015-02-19 12:14:16 +01:00
Florian Schmaus
33cf205bdc Use Objects.requireNonNull() in BytestreamSIDFilter 2015-02-18 10:06:12 +01:00
Florian Schmaus
5bb4727c57 Use Jid (and subclasses) from jxmpp-jid 
Fixes SMACK-634
 2015-02-17 16:07:16 +01:00
Florian Schmaus
bc61527bd2 Expose InterruptedException 
SMACK-632
 2015-02-14 14:57:33 +01:00
Florian Schmaus
57c1b57b7c s/ a XMPP/ an XMPP/ 2015-02-12 12:13:19 +01:00
Florian Schmaus
943dc29f92 Move vCard unit test into its own package 2015-02-09 07:35:15 +01:00
Chris Deering
0b4072ad66 Re-implementing the vCard provider using a pull parser. Extended unit tests. 2015-02-09 07:35:15 +01:00
Florian Schmaus
4698805a34 Rename 'Packet' class to 'Stanza' 
Smack still uses the term 'Packet' in some places. This is just the
first step towards using correct XMPP terms in Smack.
 2015-02-06 09:34:51 +01:00
Florian Schmaus
86ea027301 Add StringUtils.requireNotNullOrEmpty and Objects.requireNonNull 
and use this in a few places.
 2015-01-26 20:47:09 +01:00
Florian Schmaus
2cba6a68eb Fix DataFormProvider parsing 'fixed' FormFields 
b71039660b made FormField.setType(Type)
throw an illegal argument exception if type is fixed, but the
DataFormProvider was not changed, so it still would call
setType(Type.fixed).

Change DataFormProvider so that the non-argument constructer of
FormField is used when type == fixed.
 2015-01-26 07:54:12 +01:00
Florian Schmaus
d5b8647d9d Create smack-im subproject for XMPP-IM 
Move Roster and Chat(Manager) code into their own packages within the
new smack-im subproject.

Apply Manager pattern to Roster.

Fixes SMACK-637.
 2015-01-26 07:54:05 +01:00
Florian Schmaus
b265d2d2a2 Add XDataManager.isSupported(String) 
also make FormField and Option implement NamedElement and some other
minor changes to data form API.
 2015-01-21 09:50:50 +01:00
Florian Schmaus
c5db012fc8 Improve privacy parsing and API. Add NumberUtil 
Make 'order' an long

Parse fall-through case's child elements (message, iq, presence-in,
presence-out)

Remove

privacy.addExtension(new DefaultPacketExtension(parser.getName(), parser.getNamespace()));

at the beginning of PrivacyProvider. Was there since day one for an
unknown reason.
 2015-01-21 09:50:44 +01:00
Florian Schmaus
1bc3e10cff Improve Message Delivery Receipt (XEP-184) API 
add a new AutoReceiptMode enum that specifies how delivery receipt
requests are handled. Default is to send receipts if the requstor is
subscribed to the user's presence.

Also make sure that messages contain an id if a receipt request is
added to it.
 2015-01-20 12:43:11 +01:00
Florian Schmaus
8409dddffd Add PacketUtil.extensionElementFrom() 
and deprecate extensionElementfromCollection()
 2015-01-19 08:41:21 +01:00
Florian Schmaus
6bf9498904 Add note about getMultiUserChat in MUC's javadoc 2015-01-19 08:38:11 +01:00
Florian Schmaus
440af7675a Rename SmackConfiguration.DEBUG_ENABLED to DEBUG 2015-01-19 08:26:42 +01:00
Florian Schmaus
c36ffd18c2 Improve VCard API 
move API out of VCard into VCardManager. Mark old methods as deprecated.
 2015-01-17 11:45:02 +01:00
Florian Schmaus
2e23a6f150 Allows PacketCollector's to cancel each other 
This is useful for cases where a result set is requested, as it's the
case in XEP-13 and XEP-313.

Also adds
XMPPConnection.createPacketCollector(PacketCollector.Configuration).
 2015-01-16 20:55:32 +01:00
Florian Schmaus
eb6b8df7c5 Add MultiUserChat.requestVoice() 2015-01-13 13:31:45 +01:00
Florian Schmaus
b0cecee710 Rename IQ.ELEMENT to IQ.IQ_ELEMENT 
to avoid confusion between the IQ element 'iq' and the IQs child
element. ELEMENT defined in an IQ sublcass should contain the *child*
element.

Add element to StreamInitation and fix FileTransferManager which still
used a packet listener instead of an IQ request handler to handle
incoming stream initiation requests.
 2015-01-11 21:54:46 +01:00