Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-22 22:32:06 +01:00
Code Issues Releases Wiki Activity

Fix HTTP File Upload's SlotRequest

Browse source 
Fixes SMACK-774. Thanks to Nathan Freitas for reporting this.
This commit is contained in:
Florian Schmaus 2017-07-05 18:27:47 +02:00
parent e87c463927
commit 858ba3f82a
3 changed files with 25 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/element/SlotRequest.java
View file

@ -32,9 +32,9 @@ public class SlotRequest extends IQ {
public static final String ELEMENT = "request"; public static final String ELEMENT = "request";
public static final String NAMESPACE = HttpFileUploadManager.NAMESPACE; public static final String NAMESPACE = HttpFileUploadManager.NAMESPACE;
private final String filename; protected final String filename;
private final long size; protected final long size;
private final String contentType; protected final String contentType;
public SlotRequest(DomainBareJid uploadServiceAddress, String filename, long size) { public SlotRequest(DomainBareJid uploadServiceAddress, String filename, long size) {
this(uploadServiceAddress, filename, size, null); this(uploadServiceAddress, filename, size, null);
@ -82,10 +82,10 @@ public class SlotRequest extends IQ {
@Override @Override
protected IQChildElementXmlStringBuilder getIQChildElementBuilder(IQChildElementXmlStringBuilder xml) { protected IQChildElementXmlStringBuilder getIQChildElementBuilder(IQChildElementXmlStringBuilder xml) {
xml.rightAngleBracket(); xml.attribute("filename", filename);
xml.element("filename", filename); xml.attribute("size", String.valueOf(size));
xml.element("size", String.valueOf(size)); xml.optAttribute("content-type", contentType);
xml.optElement("content-type", contentType); xml.setEmptyElement();
return xml; return xml;
} }
} }

9
smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/element/SlotRequest_V0_2.java
View file

@ -40,4 +40,13 @@ public class SlotRequest_V0_2 extends SlotRequest {
public SlotRequest_V0_2(DomainBareJid uploadServiceAddress, String filename, long size, String contentType) { public SlotRequest_V0_2(DomainBareJid uploadServiceAddress, String filename, long size, String contentType) {
super(uploadServiceAddress, filename, size, contentType, NAMESPACE); super(uploadServiceAddress, filename, size, contentType, NAMESPACE);
} }
@Override
protected IQChildElementXmlStringBuilder getIQChildElementBuilder(IQChildElementXmlStringBuilder xml) {
xml.rightAngleBracket();
xml.element("filename", filename);
xml.element("size", String.valueOf(size));
xml.optElement("content-type", contentType);
return xml;
}
} }

18
smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/SlotRequestCreateTest.java
View file

@ -27,17 +27,17 @@ import org.jxmpp.stringprep.XmppStringprepException;
public class SlotRequestCreateTest { public class SlotRequestCreateTest {
String testRequest String testRequest
= "<request xmlns='urn:xmpp:http:upload:0'>" = "<request xmlns='urn:xmpp:http:upload:0'"
+ "<filename>my_juliet.png</filename>" + " filename='my_juliet.png'"
+ "<size>23456</size>" + " size='23456'"
+ "<content-type>image/jpeg</content-type>" + " content-type='image/jpeg'"
+ "</request>"; + "/>";
String testRequestWithoutContentType String testRequestWithoutContentType
= "<request xmlns='urn:xmpp:http:upload:0'>" = "<request xmlns='urn:xmpp:http:upload:0'"
+ "<filename>my_romeo.png</filename>" + " filename='my_romeo.png'"
+ "<size>52523</size>" + " size='52523'"
+ "</request>"; + "/>";
@Test @Test
public void checkSlotRequestCreation() throws XmppStringprepException { public void checkSlotRequestCreation() throws XmppStringprepException {