first step to remove OTR encryption

* make OTR available via expert settings and disable it as default

1 files changed, 3 insertions, 1 deletions

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 cb4211b1e..9797da56f 100644
--- a/src/main/java/de/pixart/messenger/ui/util/ConversationMenuConfigurator.java
+++ b/src/main/java/de/pixart/messenger/ui/util/ConversationMenuConfigurator.java
@@ -43,6 +43,8 @@ import de.pixart.messenger.entities.Conversation;
 import de.pixart.messenger.entities.Conversational;
 import de.pixart.messenger.entities.Message;
 
+import static de.pixart.messenger.ui.SettingsActivity.ENABLE_OTR_ENCRYPTION;
+
 public class ConversationMenuConfigurator {
 
     private static boolean microphoneAvailable = false;
@@ -128,7 +130,7 @@ public class ConversationMenuConfigurator {
             menuSecure.setIcon(R.drawable.ic_lock_white_24dp);
         }
 
-        otr.setVisible(Config.supportOtr());
+        otr.setVisible(Config.supportOtr() && conversation.getBooleanAttribute(ENABLE_OTR_ENCRYPTION, false));
         if (conversation.getMode() == Conversation.MODE_MULTI) {
             otr.setVisible(false);
         }