From ba02a868f60d7b58224e190baf7654ef87251df3 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Thu, 27 Jun 2024 17:04:05 +0200 Subject: [PATCH] [caps] Use DataForm.getFormType() when sorting --- .../jivesoftware/smackx/caps/EntityCapsManager.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/EntityCapsManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/EntityCapsManager.java index 15c941ba7..32c1af456 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/EntityCapsManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/EntityCapsManager.java @@ -70,7 +70,6 @@ import org.jivesoftware.smackx.disco.packet.DiscoverInfo.Identity; import org.jivesoftware.smackx.disco.packet.DiscoverInfoBuilder; import org.jivesoftware.smackx.disco.packet.DiscoverInfoView; import org.jivesoftware.smackx.xdata.FormField; -import org.jivesoftware.smackx.xdata.TextSingleFormField; import org.jivesoftware.smackx.xdata.packet.DataForm; import org.jxmpp.jid.DomainBareJid; @@ -683,12 +682,12 @@ public final class EntityCapsManager extends Manager { // by the XML character data of the element). Collections.sort(extendedInfos, new Comparator() { @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()); + public int compare(DataForm dataFormLeft, DataForm dataFormRight) { + final String formTypeLeft = dataFormLeft.getFormType(); + assert formTypeLeft != null; // ensured by the previous step. + final String formTypeRight = dataFormRight.getFormType(); + assert formTypeRight != null; // ensured by the previous step. + return formTypeLeft.compareTo(formTypeRight); } });