vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-11-22 20:12:07 +01:00
Code Issues Releases Wiki Activity

[caps] Ensure dataforms are ordered prior to ver calculation

Browse source 
Fixes SMACK-944.
This commit is contained in:
Guus der Kinderen 2024-06-25 17:14:24 +02:00 committed by Florian Schmaus
parent 951588e4ed
commit 95adfb3cdf
1 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
smack-extensions/src/main/java/org/jivesoftware/smackx/caps/EntityCapsManager.java
View file

@ -23,6 +23,7 @@ import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
@ -69,6 +70,7 @@ import org.jivesoftware.smackx.disco.packet.DiscoverInfo.Identity;
import org.jivesoftware.smackx.disco.packet.DiscoverInfoBuilder; import org.jivesoftware.smackx.disco.packet.DiscoverInfoBuilder;
import org.jivesoftware.smackx.disco.packet.DiscoverInfoView; import org.jivesoftware.smackx.disco.packet.DiscoverInfoView;
import org.jivesoftware.smackx.xdata.FormField; import org.jivesoftware.smackx.xdata.FormField;
import org.jivesoftware.smackx.xdata.TextSingleFormField;
import org.jivesoftware.smackx.xdata.packet.DataForm; import org.jivesoftware.smackx.xdata.packet.DataForm;
import org.jxmpp.jid.DomainBareJid; import org.jxmpp.jid.DomainBareJid;
@ -667,16 +669,30 @@ public final class EntityCapsManager extends Manager {
} }
List<DataForm> extendedInfos = discoverInfo.getExtensions(DataForm.class); List<DataForm> extendedInfos = discoverInfo.getExtensions(DataForm.class);
for (DataForm extendedInfo : extendedInfos) { final Iterator<DataForm> iter = extendedInfos.iterator();
if (!extendedInfo.hasHiddenFormTypeField()) { while (iter.hasNext()) {
if (!iter.next().hasHiddenFormTypeField()) {
// Only use the data form for calculation is it has a hidden FORM_TYPE field. // Only use the data form for calculation is it has a hidden FORM_TYPE field.
// See XEP-0115 5.4 step 3.f // See XEP-0115 5.4 step 3.f
continue; iter.remove();
} }
}
// 6. If the service discovery information response includes // 6. If the service discovery information response includes
// XEP-0128 data forms, sort the forms by the FORM_TYPE (i.e., // XEP-0128 data forms, sort the forms by the FORM_TYPE (i.e.,
// by the XML character data of the <value/> element). // by the XML character data of the <value/> element).
Collections.sort(extendedInfos, new Comparator<DataForm>() {
@Override
public int compare(DataForm d1, DataForm d2) {
final TextSingleFormField hft1 = d1.getHiddenFormTypeField();
assert hft1 != null; // ensured by the previous step.
final TextSingleFormField hft2 = d2.getHiddenFormTypeField();
assert hft2 != null; // ensured by the previous step.
return hft1.getFirstValue().compareTo(hft2.getFirstValue());
}
});
for (DataForm extendedInfo : extendedInfos) {
SortedSet<FormField> fs = new TreeSet<>(new Comparator<FormField>() { SortedSet<FormField> fs = new TreeSet<>(new Comparator<FormField>() {
@Override @Override
public int compare(FormField f1, FormField f2) { public int compare(FormField f1, FormField f2) {