From f16e3ecb856545de6003a3bf38419b4abe5a798f Mon Sep 17 00:00:00 2001 From: Stephen Paul Weber Date: Sun, 17 Sep 2023 23:08:28 -0500 Subject: [PATCH] If we hid the next button, then we have to use button grid --- .../java/eu/siacs/conversations/entities/Conversation.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java index fd409ad13847ba7944116b0a0d01b2678ee645af..aa17d8d273ca7eeeba613a285404215301cb257c 100644 --- a/src/main/java/eu/siacs/conversations/entities/Conversation.java +++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java @@ -2527,10 +2527,10 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl } } else if (fieldType.equals("list-single")) { Element validate = el.findChild("validate", "http://jabber.org/protocol/xdata-validate"); - if (Option.forField(el).size() > 9) { - viewType = TYPE_SEARCH_LIST_FIELD; - } else if (fillableFieldCount == 1 && actionsAdapter.countExceptCancel() < 1) { + if (fillableFieldCount == 1 && actionsAdapter.countExceptCancel() < 1) { viewType = TYPE_BUTTON_GRID_FIELD; + } else if (Option.forField(el).size() > 9) { + viewType = TYPE_SEARCH_LIST_FIELD; } else if (el.findChild("value", "jabber:x:data") == null || (validate != null && validate.findChild("open", "http://jabber.org/protocol/xdata-validate") != null)) { viewType = TYPE_RADIO_EDIT_FIELD; } else {