26e6efa767
[address] Fix NPE in MultipleRecipientManager
...
The arguments 'to', 'cc, and 'bcc' may be null, hence ensure that they
are non-null when calling e.g. size() on them.
Fixes SMACK-907
Fixes: df96c57093
2021-06-03 19:10:07 +02:00
39b211cde3
[muc] Use StanzaCollector.nextResultBlockForever() in MultiUserChat.nextMessage()
2021-05-12 10:18:17 +02:00
b0729d83a8
[jingle] Do not call nextResult() in JingleUtil
...
StanzaCollector.nextResult() will not cancel the related stanza
collector potentially causing a resource leak.
2021-05-12 10:12:59 +02:00
aab48570c9
Call XMPPConnection.sendIqRequestAndWaitForResponse(IQ) where possible
...
Refactored using
find . -type f -name "*.java" |\
xargs sed -i -E |\
's/\.createStanzaCollectorAndSend\((\w+)\)\.nextResultOrThrow\(\);/.sendIqRequestAndWaitForResponse(\1);/'
and some manual refactoring.
2021-05-12 10:12:40 +02:00
c9ea1c11b6
[search] Return and expect the high-level forms API types
2021-05-02 22:02:40 +02:00
6ec654ad1e
[muc] Fix javadoc of MultiUserChat.getConfigurationForm()
...
This method no longer returns null.
2021-05-02 22:02:00 +02:00
6af38482de
[iqversion] Use IQ builder pattern
2021-05-02 17:16:58 +02:00
469d4fb0dc
[time] Use IqBuilder pattern and improve API
2021-05-02 17:16:58 +02:00
6b14fcab75
[geoloc] Mark Builder constructor as deprecated
2021-05-02 17:16:58 +02:00
6011d566cf
[geoloc] Do not use Time IQ for timezone operations
2021-05-02 17:16:58 +02:00
5cd77ec741
[geoloc] Mark Builder class final
2021-05-02 16:32:42 +02:00
64c82ca0cf
[muc] Add MultiUserChat.destroy()
2021-04-23 17:34:47 +02:00
c95c8264da
[muc] Improve javadoc of MultiUserChat.destory(String, EntityBareJid)
2021-04-18 21:38:55 +02:00
3d4e7938a7
Make ExtensionElement marker interface wrt. QNAME field
...
ExtensionElement is now a marker interface that requires all
implementation non-abstract classes to carry a static final QNAME
field (of type QName). This is verified by a new unit test.
Also FullyQualifiedElement is renamed to simply XmlElement. XmlElement
is used over ExtensionElement when implementing classes do not
statically know the qualified name of the XML elements they
represent. In general, XmlElement should be used sparingly, and every
XML element should be modeled by its own Java class (implementing
ExtensionElement).
2021-04-18 21:07:19 +02:00
5493a22e44
Merge branch '4.4'
2021-04-18 17:25:14 +02:00
961882ff7f
Add more QNAME fields to extension element classes
2021-04-18 17:23:34 +02:00
36c7521ca2
[offline] Add OfflineMessageInfo.QNAME field
...
Fixes SMACK-905.
2021-04-18 17:17:48 +02:00
b0abfe1bba
[offline] Make OfflineMessageManager.NAMESPACE public
2021-04-18 17:16:38 +02:00
fbddd074bc
[gradle] Do not use deprecated 'compile' directive
2021-04-14 20:30:51 +02:00
b7709f583d
Make muc.join() mirror muc.leave() and return the self-presence
2021-04-07 10:33:38 +01:00
090858f467
[xdata] Automatically fill required fields with a default value
2021-04-01 12:55:28 +02:00
68edc8b9f5
[xdata] Allow FillableForm.write() ot overwrite already filled fields
2021-04-01 12:54:52 +02:00
61713c500c
Smack 4.4.2
...
-----BEGIN PGP SIGNATURE-----
iQGTBAABCgB9FiEEl3UFnzoh3OFr5PuuIjmn6PWFIFIFAmBcSRtfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDk3
NzUwNTlGM0EyMURDRTE2QkU0RkJBRTIyMzlBN0U4RjU4NTIwNTIACgkQIjmn6PWF
IFJs0wf/TYm4e4LlBiekmar8YnfaAObT9loDiqMJjO5s4g+trYx2U3gCKkRvKI0P
U/jzqoJohcPY+5s/fkGKaBWjzFD5WucHyvNaP01D4EWSvHXpCMElbSxY1Uz3X4k1
t0pmdb27DoHhtdqMfw1Cg7Nba4M+ZzdrEIkDRgCNA8H0mJoKpnsDAg8Y6kEUnvt6
WQxmIZ49ZT9UOQnVbsXUk4t5DZDz1GdQggrDS5Sh+rZaRFy1KyDgLC+X4NQO99RV
v3Tf4VRIy+6Nen7L/av3qwSBRqpvc1TEJauNwOnYvyuDwpwjE0tEfRuFZ8wjtkAz
CKF+LLor+WA5Y2GCXEegLJxVd9Je6Q==
=hZJ2
-----END PGP SIGNATURE-----
Merge tag '4.4.2'
Smack 4.4.2
2021-03-25 11:45:03 +01:00
d07d46bbdc
[chat2] Fix resource unlock condition
...
If the resource of the updated presence is equal to the currently
locked resource, then no further action is required.
Thanks to Pedro Oliveira for reporting this.
Reported-by: Pedro Oliveira <kanytu@gmail.com>
2021-03-25 08:22:12 +01:00
eb31479913
[muc] Make sendMessage() return a MessageView of the sent message
2021-03-25 08:19:53 +01:00
ed807d5954
Merge branch '4.4'
2021-03-23 21:41:25 +01:00
4381d04831
[muc] Introduce MucMessageInterceptor
2021-03-23 21:27:10 +01:00
4fefa92e40
Merge branch '4.4'
2021-03-19 09:47:07 +01:00
d75cd2acb8
[filetransfer] Pre-register 'stream-method' form field
...
Fixes SMACK-904.
2021-03-14 19:34:28 +01:00
adc159186c
[formtypes] Introduce LOOKASIDE_FIELD_REGISTRY
...
Some field's like stream-method of XEP-0096, which is of type
list-single, need to be pre-registered.
2021-03-14 17:58:13 +01:00
2779187d8c
[filetransfer] Set the status to error in setException()
...
FileTransfer would previously not change the status, even though an
exception has been set, leading users to believe that the transfer is
still ongoing, when it is not.
2021-03-14 17:54:03 +01:00
c564c89c40
[extensions] Add OutgoingFileTransfer.setCallback()
...
Some methods of OutgoingFileTransfer take already the
NegotiationProgress callback as argument, some do not. The API is not
ideal, and adding a setter for the callback at least makes it possible
to always have the callback.
2021-03-14 17:52:12 +01:00
9d1b88a877
[muc] Do not filter for presence ID if #stable_id is not announced
...
On leave(), do not filter for presence ID if the MUC service does not
announce #stable_id.
2021-03-14 12:48:01 +01:00
48f5e349b9
Smack 4.4.1
...
-----BEGIN PGP SIGNATURE-----
iQGTBAABCgB9FiEEl3UFnzoh3OFr5PuuIjmn6PWFIFIFAmA/eF1fFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDk3
NzUwNTlGM0EyMURDRTE2QkU0RkJBRTIyMzlBN0U4RjU4NTIwNTIACgkQIjmn6PWF
IFLlCQf6A9u5hd2v36Cve/Iopx/GAjuHBNu/7DYop7gP7vLtKxUBGCS/DLn8kaov
ujpTvdcpm6pg7F4uivMnADFqkkL9cUwsBPDyNY8c0ygfGzVPU8P47g00/SBhB7kP
0/0In4eunXt8+tfs/afHrr1kQG66lq5J/9q8M6bbC9pUYO2g5Flxes0WW9azluVh
zs39CCtXPeXwr6Lh+HNEyIe/WiHKnOj7zkwpV7htmOnPaedlRJj/e8KbcBDxmZhg
zbMoI3Puq3grlA6spke6Z7HK6IeFZjbZABI4EeCEUVhUq1VvL0JurV92S672dty+
SXX64GbA5TLbVq04I+NP28x9kgnRiw==
=skkJ
-----END PGP SIGNATURE-----
Merge tag '4.4.1'
Smack 4.4.1
2021-03-03 13:39:57 +01:00
d4d2a7a6d8
[xdata] Do not require FORM_TYPE field in FilledForm
...
The FillableForm API is the most convenient way of filling out a
form. Currently only forms with a FORM_TYPE can be filled, due to a
restriction in FillableForm. This makes filling out untyped forms very
cumbersome.
This commit removes the required FORM_TYPE when using FilledForm (and
therefor FillableForm). Some subclasses of FilledForm already check
that the correct FORM_TYPE is set using FilledForm#ensureFormType().
2021-03-03 12:42:17 +01:00
33f59fd7ed
[xdata] Ensure that hidden FROM_TYPE field is first
2021-03-02 21:40:52 +01:00
1c262471e5
[xdata] Use extra registry for fields in clark notation
...
If a field name is in clark notation, then lookup the field's type via
an extra registry.
2021-03-02 11:43:23 +01:00
4e90db3191
[gitlab-ci] Also check with Java 15
2021-02-15 13:12:24 +01:00
bda3901910
Deprecate DataForm.Builder.setType()
2021-01-29 20:40:05 +01:00
070aa8e28e
[DataFormProvider] Retrieve field types from <reported/> if possible
...
Fixes SMACK-902.
2021-01-29 20:40:05 +01:00
a7b3303f3e
Bump ErrorProne to 2.5.1 and refactor Providers a bit
...
This also resulted in a refactoring of the Providers and parsing
Exceptions. NumberFormatException and ParseException can now be thrown
directly, the wrapping in a SmackParsingException is down at a higher
layer, i.e. in AbstractProvider.
2021-01-29 09:26:15 +01:00
0c013e4f29
Merge branch '4.4'
2021-01-25 19:48:16 +01:00
9ab50c374d
[extensions] Use StanzaView as parameter type in BoBDataExtension.from()
...
BoBDataExtensions can also appear in IQs (Registration IQ), and
potentially also Presence stanzas.
Fixes SMACK-901.
2021-01-25 14:29:21 +01:00
d64a9d9029
[xdata] Fix NPE in DataForm.Builder.addItem()
...
Fixes SMACK-900.
2021-01-12 09:41:46 +01:00
1bfb9f34f1
Merge branch '4.4'
2021-01-12 09:22:42 +01:00
df3ca4100b
[caps] Check for null in EntityCapsManager.addCapsExtension()
...
To avoid a NPE, we check for null in addCapsExtension.
Fixes SMACK-899.
2021-01-12 09:01:19 +01:00
35a71f0131
Merge branch '4.4'
2021-01-06 13:51:38 +01:00
d64ee785bd
[extensions] Add BoBDataExtension getBobData() and getContentId()
...
Those two methods where missing after the BoB API redesign.
Fixes SMACK-896.
2021-01-06 13:47:09 +01:00
d8642847ea
Smack 4.4.0
...
-----BEGIN PGP SIGNATURE-----
iQGTBAABCgB9FiEEl3UFnzoh3OFr5PuuIjmn6PWFIFIFAl/Msl5fFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDk3
NzUwNTlGM0EyMURDRTE2QkU0RkJBRTIyMzlBN0U4RjU4NTIwNTIACgkQIjmn6PWF
IFIq8gf9GZp0Cl9Gr+seA/C8nczE/cNRKfHnDR224klbjlGrnojb+bL2QgeKG6wN
u/eL3+UMus8uw3+R8NKARawqt/r6mbk4bgdGEbzoByLO6iiPYTr7TuZmTOQyZa5L
tMNkFIvfvMzDeDDqI4z4uTgT3s7YBg0d4BT7cL8T6RaZGHF57OxqhWnKxMuaiTXH
HJzVTPrtAcYg17QZl5+mrhiWyynE5+4QGeluYHlh7vvsniwNOqrwO1vWHg2BX003
DjaHK+6oLjKxVljCklXxE7Wsx0VcMrBfv2qZwW3Q4ZzZVcrAn8TC4HrUtR8DL176
DpGlEhmmdr3xKKX0JQ9RmIod+xSabw==
=4wGX
-----END PGP SIGNATURE-----
Merge tag '4.4.0'
Smack 4.4.0
2020-12-06 12:16:44 +01:00
a4bb5bfda8
[ibb] Use UInt16 for 'seq' and fix its handling
...
Fixes a off-by-one error when incrementing 'seq'. Thanks to Kim
Alvefur <zash@zash.se> for spotting this.
2020-12-05 23:04:17 +01:00
3f3a7cb540
Merge branch '4.4'
2020-11-09 21:23:25 +01:00
59cf449799
Provide more detailed code comment.
2020-11-09 21:21:27 +01:00
0ff8040895
FileTransfer: replace Error.none with null
...
This fixes an inconsistent representation of a 'no error' representation, that
causes a file transfer in which not enough bytes were transferred to _not_ be
marked as having a problem.
2020-11-09 21:21:27 +01:00
71f5cfe3da
Merge branch '4.4'
2020-11-09 11:08:47 +01:00
1f5ada4822
Add org.jivesoftware.smack.Smack with getVersion() and ensureInitialized()
2020-11-09 08:46:57 +01:00
df96c57093
[address] Get rid of PacketCopy workaround
...
PacketCopy subclassing Stanza was always a peculiarity. The only
subclasses of Stanza should be Message, Presence, and IQ.
2020-11-09 08:46:56 +01:00
7e311ab9df
[muc] Prevent race condition on enter() by waiting
...
This prevents a race condition of enter() with the presence listern by
waiting until all presences have been processed.
Reported-by: Guus der Kinderen <guus@goodbytes.nl>
2020-11-09 08:46:56 +01:00
f12fe2264a
[muc] Only retrieve MUCUser once in Presence listener
2020-11-08 19:37:41 +01:00
cfccc78ba0
[muc] Rename local variable 'presence' to 'reflectedSelfPresence'
...
To increase readability, and with that maintainability, we rename
'presence' to 'reflectedSelfPresence' in MultiUserChat.enter(), to
make it clear what kind of presence this variable holds.
Also mark the variable as final.
2020-11-03 22:31:22 +01:00
55d7b9d4eb
Fix pubsub options rendering
...
The exiting code generates an unintentional nested 'options' child element:
```
<iq to='pubsub.example.org' id='FQTHU-126' type='get'>
<pubsub xmlns='http://jabber.org/protocol/pubsub '>
<options node='sinttest-multisubscribe-nodename-13pnc'>
<options jid='smack-inttest-two-13pnc@example.org'
node='sinttest-multisubscribe-nodename-13pnc'/>
</options>
</pubsub>
</iq>
```
This commit removes the undesired nesting, resulting in:
```
<iq to='pubsub.example.org' id='FQTHU-126' type='get'>
<pubsub xmlns='http://jabber.org/protocol/pubsub '>
<options jid='smack-inttest-two-13pnc@example.org'
node='sinttest-multisubscribe-nodename-13pnc'/>
</pubsub>
</iq>
```
2020-10-27 10:23:17 +01:00
5782fff2a4
Merge branch '4.4'
2020-09-23 21:42:51 +02:00
6d39a4e3ac
[bob] Add BoBDataExtension, remove BoBExtension
...
BoBExtension extending XHTMLExtension was poorly designed and only
worked for a single paragraphy.
Fixes SMACK-770.
2020-09-23 19:57:13 +02:00
fe7d3bec30
Make Forwarded a generic type
...
Fixes SMACK-821.
2020-09-23 17:48:04 +02:00
d00656493a
[jingle] Use correct XmlStringBuilder constructor in JingleReason
2020-08-26 11:34:57 +02:00
3003094130
Merge pull request #412 from Flowdalic/data-form-type-annotations
...
[xdata] Parse forms of any kind without field type annotations
2020-07-23 17:24:48 +02:00
1bd097ed9b
Merge pull request #411 from Flowdalic/sasl
...
SASL / getFeature()
2020-07-23 16:09:57 +02:00
103ffabc08
[xdata] Parse forms of any kind without field type annotations
...
We previously only looked in the registry for 'submit' type forms. But
also 'result' type forms may be send without field type
annotations. Same is true, but less likely, for 'form' type forms.
2020-07-23 15:47:17 +02:00
329948b442
Add XMPP.(get|has)Feature(Class|QName) and deprecate (String, String)
2020-07-23 14:32:14 +02:00
b7fe56fb9b
[xdata] Add message to IllegalArgumentException
2020-07-06 11:51:12 +02:00
3e8666cd91
[xdata] Fix case in FillableForm
2020-07-06 11:51:12 +02:00
ed02bcf0d4
[ibb] Ensure InBandBytestreamManager is a singleton
...
InBandBytestreamManager followed an unusual pattern: Within the
connectionTermianted() callback, it would remove itself from the
'managers' map. This allowed for multiple instances of an
InBandBytestreamManager to exist for the same connection, causing all
kinds of issues.
This fixes the issue by changing InBandBytestreamManager to use the
Smack-idiomatic pattern used by managers.
We also do no longer reset the listeners if the connection is
termianted, as listeners (and handlers) typically persist until they
are explicitly removed by the user.
As positive side-effect, the number of indeterministic unit-tests,
caused by using Thread.sleep(), is reduced. The executor service in
InitiationListener was also removed, because the IQ handler is already
called asynchronously to the connections main loop.
Thanks to Anno van Vliet for reporting this.
2020-07-03 22:01:15 +02:00
Paul Schaub
99cb60dac7
Add missing rightangle bracket to FormNode addXml()
2020-06-15 16:15:27 +02:00
3f9ca68134
Delete TypedCloneable
2020-06-14 17:38:51 +02:00
18c2c37ad0
Rename XmlUnitUtils to XmlAssertUtil
2020-06-14 16:53:21 +02:00
9d6665735f
[pubsub] Rework NodeExtension.toXML()
2020-06-14 16:52:13 +02:00
8e337d7810
[muc] Make providesMucService() use the KNOWN_MUC_SERVICES cache
...
This reduces the number of disco#info queries on MUC join in some
situations.
2020-06-12 15:54:14 +02:00
ccc785062e
[extensions] Deprecate old-style PepManager PEP listeners
2020-05-25 20:32:47 +02:00
d65f2c932e
Bump Error Prone version to 2.3.4 and fix new bug patterns
2020-05-24 21:10:01 +02:00
9a8ee3c8e3
[core] Improve NumberUtil's exception message and fix javadoc
2020-05-24 13:08:03 +02:00
ebe5c49e92
[checkstyle] Tighten JavadocMethod checkstyle rule
2020-05-23 22:43:29 +02:00
a137944e50
[disco/caps] Fix DiscoverInfo.asBuilder()
...
The method would not copy the extensions elements, which would lead to
a false calculation of the caps hash by EntityCapsManager.
2020-05-22 15:38:16 +02:00
0db6406262
[softwareinfo] Separate static and non-static fields by empty line
2020-05-22 15:36:39 +02:00
54d6bc8658
[softwareinfo] Remove SoftwareInfoManager.isSupported(Jid)
...
SoftwareInfoManager.fromJid(Jid) will return 'null' if the jid in
question does not announce or support this.
2020-05-22 15:35:56 +02:00
027358fc63
[softwareinfo] Remove unnecessary throws declarations
2020-05-22 15:34:27 +02:00
b3c57ef918
[xhtmlim] Use stanza builder API, deprecate old
2020-05-21 22:45:28 +02:00
2679c72f0f
[disco] Move logic that was previously in EntityCapsManager in SDM
2020-05-18 09:15:15 +02:00
46ba273689
[disco] Delay the entity caps renewal
...
This avoids the calculation of the caps hash while the managers become
registered with the connection and add their features.
2020-05-18 09:15:14 +02:00
f00acbff89
Merge pull request #340 from adiaholic/XEP-0232
...
Add support for XEP-0232 : Software Information
2020-05-16 12:08:35 +02:00
17ca4c541b
Add support for XEP-0232: Software Information
...
By making use of an extended data format, service discovery responses
can be used to constitute software information.
Solves SMACK-853.
2020-05-16 14:02:25 +05:30
9fd5bc7873
[pubsub] Make Fillable(Configure|Subscribe)Form constructors package-private
...
Those are not meant to be used directly.
2020-05-15 11:54:49 +02:00
fec928ffe7
[pubsub] Add missing "FillableSubscribeForm SubscribeForm.getFillableForm()"
2020-05-15 11:54:49 +02:00
565397f632
[pubsub] Make FillableSubscribeForm implement SubscribeFormReader
2020-05-15 11:54:49 +02:00
c5212c20b6
[xdata] Rename FormReader.read(String) to getField(String)
...
Now that FormWriter, with its write() method, is gone, there is no
reason the FormReader method should still be named read(). Renaming to
getField() as this is what DataForm also uses.
2020-05-14 17:13:01 +02:00
d6c1018b47
[xdata] Remove FormWriter
...
The FormWriter interface was a left over from the initial design of
the reworked API, but is no longer required.
2020-05-14 17:13:01 +02:00
afa42a8b41
Remove `TODO:method should not throw any exception but currently does`
...
`mgr.getNode(...)` method is not supposed to throw any type
of exception. It threw two kinds of exceptions: `NotConnectedException`
and `SmackException`.
By using `ThreadedDummyConnection.newInstance()` method,
`NotConnectedException` can be removed. And `SmackException`
can be removed by correctly building the DiscoverInfo packet.
2020-05-13 22:25:22 +02:00
50cb7735d1
[muc] Add generic callback invoked if a participant is removed
...
Fixes SMACK-883.
2020-05-13 22:14:43 +02:00
ab2d3a2b79
[core] Deprecate AbstractConnectionListener
2020-05-13 22:14:43 +02:00
13abeb9626
[muc] Deprecate DefaultUserStatusListener
2020-05-13 22:01:17 +02:00
aacd94c62e
[muc] Deprecate DefaultParticipantStatusListener
2020-05-13 22:00:42 +02:00
498dde2d86
Merge branch 'master' of github.com:igniterealtime/Smack
2020-05-13 20:20:01 +02:00
Florian Schmaus
Dan Caseley
Frank Matheron
Guus der Kinderen
Paul Schaub
damencho
Aditya Borikar