narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

include form fields into caps hash calculation

Browse source
This commit is contained in:
Daniel Gultsch 2016-03-31 14:21:56 +02:00
parent 8d98c52803
commit 867d0ef191
2 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/main/java/eu/siacs/conversations/entities/ServiceDiscoveryResult.java
View file

@ -17,6 +17,7 @@ import org.json.JSONObject;
import eu.siacs.conversations.xml.Element; import eu.siacs.conversations.xml.Element;
import eu.siacs.conversations.xmpp.forms.Data; import eu.siacs.conversations.xmpp.forms.Data;
import eu.siacs.conversations.xmpp.forms.Field;
import eu.siacs.conversations.xmpp.stanzas.IqPacket; import eu.siacs.conversations.xmpp.stanzas.IqPacket;
public class ServiceDiscoveryResult { public class ServiceDiscoveryResult {
@ -219,8 +220,22 @@ public class ServiceDiscoveryResult {
}); });
for(Data form : forms) { for(Data form : forms) {
s.append(form.getFormType()+"<"); s.append(form.getFormType() + "<");
//TODO append fields and values List<Field> fields = form.getFields();
Collections.sort(fields, new Comparator<Field>() {
@Override
public int compare(Field lhs, Field rhs) {
return lhs.getFieldName().compareTo(rhs.getFieldName());
}
});
for(Field field : fields) {
s.append(field.getFieldName()+"<");
List<String> values = field.getValues();
Collections.sort(values);
for(String value : values) {
s.append(value+"<");
}
}
} }
MessageDigest md; MessageDigest md;

12
src/main/java/eu/siacs/conversations/xmpp/forms/Data.java
View file

@ -9,6 +9,8 @@ import eu.siacs.conversations.xml.Element;
public class Data extends Element { public class Data extends Element {
private static final String FORM_TYPE = "FORM_TYPE";
public Data() { public Data() {
super("x"); super("x");
this.setAttribute("xmlns","jabber:x:data"); this.setAttribute("xmlns","jabber:x:data");
@ -17,7 +19,8 @@ public class Data extends Element {
public List<Field> getFields() { public List<Field> getFields() {
ArrayList<Field> fields = new ArrayList<Field>(); ArrayList<Field> fields = new ArrayList<Field>();
for(Element child : getChildren()) { for(Element child : getChildren()) {
if (child.getName().equals("field")) { if (child.getName().equals("field")
&& !FORM_TYPE.equals(child.getAttribute("var"))) {
fields.add(Field.parse(child)); fields.add(Field.parse(child));
} }
} }
@ -26,7 +29,8 @@ public class Data extends Element {
public Field getFieldByName(String needle) { public Field getFieldByName(String needle) {
for(Element child : getChildren()) { for(Element child : getChildren()) {
if (child.getName().equals("field") && needle.equals(child.getAttribute("var"))) { if (child.getName().equals("field")
&& needle.equals(child.getAttribute("var"))) {
return Field.parse(child); return Field.parse(child);
} }
} }
@ -76,11 +80,11 @@ public class Data extends Element {
} }
public void setFormType(String formType) { public void setFormType(String formType) {
this.put("FORM_TYPE", formType); this.put(FORM_TYPE, formType);
} }
public String getFormType() { public String getFormType() {
String type = getValue("FORM_TYPE"); String type = getValue(FORM_TYPE);
return type == null ? "" : type; return type == null ? "" : type;
} }