From 6eac99fc375e12967606290de1c367ed9f4af3dd Mon Sep 17 00:00:00 2001 From: Stephen Paul Weber Date: Thu, 20 Feb 2025 07:45:50 -0500 Subject: [PATCH] Do not allow values that aren't in options if !open In case the existing value is no longer an option --- .../java/eu/siacs/conversations/entities/Conversation.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java index c920481fca33b01246be5176060d80df3fa587a3..2e10bc2edd543ec3f23573e9eda7f9953cea1b9a 100644 --- a/src/main/java/eu/siacs/conversations/entities/Conversation.java +++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java @@ -2382,9 +2382,10 @@ public class Conversation extends AbstractEntity binding.list.setOnItemClickListener((parent, view, position, id) -> { Set values = new HashSet<>(); if (multi) { + final var optionValues = options.stream().map(o -> o.getValue()).collect(Collectors.toSet()); values.addAll(field.getValues()); for (final String value : field.getValues()) { - if (filteredValues.contains(value)) { + if (filteredValues.contains(value) || (!open && !optionValues.contains(value))) { values.remove(value); } }