mirror of
https://github.com/vanitasvitae/Smack.git
synced 2024-06-12 14:44:49 +02:00
0d73c21945
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
79 lines
2.2 KiB
Java
79 lines
2.2 KiB
Java
/**
|
|
*
|
|
* Copyright the original author or authors
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
package org.jivesoftware.smackx.pubsub;
|
|
|
|
import org.jivesoftware.smack.util.XmlStringBuilder;
|
|
|
|
import org.jivesoftware.smackx.xdata.packet.DataForm;
|
|
|
|
/**
|
|
* Generic stanza extension which represents any PubSub form that is
|
|
* parsed from the incoming stream or being sent out to the server.
|
|
*
|
|
* Form types are defined in {@link FormNodeType}.
|
|
*
|
|
* @author Robin Collier
|
|
*/
|
|
public class FormNode extends NodeExtension {
|
|
private final DataForm configForm;
|
|
|
|
/**
|
|
* Create a {@link FormNode} which contains the specified form.
|
|
*
|
|
* @param formType The type of form being sent
|
|
* @param submitForm The form
|
|
*/
|
|
public FormNode(FormNodeType formType, DataForm submitForm) {
|
|
this(formType, null, submitForm);
|
|
}
|
|
|
|
/**
|
|
* Create a {@link FormNode} which contains the specified form, which is
|
|
* associated with the specified node.
|
|
*
|
|
* @param formType The type of form being sent
|
|
* @param nodeId The node the form is associated with
|
|
* @param submitForm The form
|
|
*/
|
|
public FormNode(FormNodeType formType, String nodeId, DataForm submitForm) {
|
|
super(formType.getNodeElement(), nodeId);
|
|
configForm = submitForm;
|
|
}
|
|
|
|
/**
|
|
* Get the Form that is to be sent, or was retrieved from the server.
|
|
*
|
|
* @return The form
|
|
*/
|
|
public DataForm getForm() {
|
|
return configForm;
|
|
}
|
|
|
|
@Override
|
|
protected void addXml(XmlStringBuilder xml) {
|
|
if (configForm == null) {
|
|
xml.closeEmptyElement();
|
|
return;
|
|
}
|
|
|
|
xml.rightAngleBracket();
|
|
xml.append(configForm);
|
|
xml.closeElement(this);
|
|
}
|
|
|
|
}
|