|
Florian Schmaus <flo@geekplace.eu>
|
001985647a1406e338783dc023e51a7f4b85c62e
|
Merge branch '4.4'
This also fixes a errornous merge where the same branch with different
commit was merged into master and 4.4
The conflicting commits are
4.4:
8f760eaeb319 getRawValueCharSequences
e626580f682b
master:
b47225c2c104 getRawValues
097d2453582f |
|
|
|
Florian Schmaus <flo@geekplace.eu>
|
0d73c21945710134c500867ab413082ec3e4404f
m |
[pubsub] FormNode(Provider) should not fail if there is no DataForm
Error IQ respones may not contain a data form, e.g.
<iq type="error" id="6LXNC-48" from="pubsub.openfire.xmpp.test" to="anno@openfire.xmpp.test/5dsi4g084a">
<pubsub xmlns="http://jabber.org/protocol/pubsub#owner">
<configure node="fdp/submitted/spot_report"/>
</pubsub>
<error code="403" type="auth">
<forbidden xmlns="urn:ietf:params:xml:ns:xmpp-stanzas"/>
</error>
</iq>
Also FormNode's toXML() already handled the case where submitForm was
'null'. Only the constructor threw a IAE if submitForm was 'null'.
Fixes SMACK-910.
Closes: https://github.com/igniterealtime/Smack/pull/471 |
|
|
|
Florian Schmaus <flo@geekplace.eu>
|
f39e433121fe0f254d2d00fda40abbeb0ea85edd
m |
Merge pull request #484 from guusdk/SMACK-908_debugger-tabs_4.4-branch
SMACK-908: Don't use components to count tabs in Debugger |
|
|
|
Florian Schmaus <flo@geekplace.eu>
|
d7c708b1670489bfcc6bd8089c242e1780e5f2dc
m |
Merge pull request #486 from Flowdalic/4.4-form-fields-raw
Provide and use the raw values of form fields |
|
|
|
Florian Schmaus <flo@geekplace.eu>
|
e626580f682bc1b924014fbb09adefffc89f33c6
m |
[xdata] Safe the raw character data of form field values
Related to SMACK-909. |
|
