From cc138052977ae7d72b01661fb35b4ac42b1d53fb Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Mon, 9 Jul 2018 22:37:17 +0200 Subject: handle non participating mucs a bit better --- .../de/pixart/messenger/ui/util/ConversationMenuConfigurator.java | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/main/java/de/pixart/messenger/ui/util/ConversationMenuConfigurator.java') diff --git a/src/main/java/de/pixart/messenger/ui/util/ConversationMenuConfigurator.java b/src/main/java/de/pixart/messenger/ui/util/ConversationMenuConfigurator.java index eb7217b95..03f7638e3 100644 --- a/src/main/java/de/pixart/messenger/ui/util/ConversationMenuConfigurator.java +++ b/src/main/java/de/pixart/messenger/ui/util/ConversationMenuConfigurator.java @@ -40,6 +40,7 @@ import de.pixart.messenger.R; import de.pixart.messenger.crypto.OmemoSetting; import de.pixart.messenger.crypto.axolotl.AxolotlService; import de.pixart.messenger.entities.Conversation; +import de.pixart.messenger.entities.Conversational; import de.pixart.messenger.entities.Message; public class ConversationMenuConfigurator { @@ -71,6 +72,11 @@ public class ConversationMenuConfigurator { public static void configureEncryptionMenu(@NonNull Conversation conversation, Menu menu) { final MenuItem menuSecure = menu.findItem(R.id.action_security); + final boolean participating = conversation.getMode() == Conversational.MODE_SINGLE || conversation.getMucOptions().participating(); + if (!participating) { + menuSecure.setVisible(false); + return; + } final MenuItem none = menu.findItem(R.id.encryption_choice_none); final MenuItem otr = menu.findItem(R.id.encryption_choice_otr); final MenuItem pgp = menu.findItem(R.id.encryption_choice_pgp); -- cgit v1.2.3