From 15e6e321e659c6f2411d7580d5dc908300a4e1d1 Mon Sep 17 00:00:00 2001 From: Stephen Paul Weber Date: Tue, 20 Feb 2024 17:56:28 -0500 Subject: [PATCH] Hide subject option when in legacy encryption --- .../eu/siacs/conversations/ui/ConversationFragment.java | 1 + .../ui/util/ConversationMenuConfigurator.java | 8 +++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java index 64b9709049b3ec718db0831e3ad5e3e9499e51e1..40c12cd8c7ac91a02683e760739e26eba23e1df9 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java @@ -1629,6 +1629,7 @@ public class ConversationFragment extends XmppFragment MenuItem newItem = menu.add(item.getGroupId(), item.getItemId(), item.getOrder(), item.getTitle()); newItem.setIcon(item.getIcon()); } + ConversationMenuConfigurator.configureAttachmentMenu(conversation, menu); return; } diff --git a/src/main/java/eu/siacs/conversations/ui/util/ConversationMenuConfigurator.java b/src/main/java/eu/siacs/conversations/ui/util/ConversationMenuConfigurator.java index ca9d4c83d1b82b3728d3afaea08937339f41d39c..0e206daad9ac75e1783ae9492f3eedbf80cb59a1 100644 --- a/src/main/java/eu/siacs/conversations/ui/util/ConversationMenuConfigurator.java +++ b/src/main/java/eu/siacs/conversations/ui/util/ConversationMenuConfigurator.java @@ -60,11 +60,9 @@ public class ConversationMenuConfigurator { } else { visible = true; } - menuAttach.setVisible(visible); - if (!visible) { - return; - } - menu.findItem(R.id.attach_record_voice).setVisible(microphoneAvailable); + if (menuAttach != null) menuAttach.setVisible(visible); + if (visible) menu.findItem(R.id.attach_record_voice).setVisible(microphoneAvailable); + menu.findItem(R.id.attach_subject).setVisible(conversation.getNextEncryption() == Message.ENCRYPTION_NONE); } public static void configureEncryptionMenu(@NonNull Conversation conversation, Menu menu) {