aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
diff options
context:
space:
mode:
authorChristian S <christian@pix-art.de>2015-08-08 13:53:04 +0200
committerChristian S <christian@pix-art.de>2015-08-08 13:53:04 +0200
commitef736ec0d83316ada9a763ed4318b2e9f60e65c6 (patch)
tree698eb3209a8a2671c85ee2efdfcd373fe5467298 /src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
parent66a72b1adb83255f294f5ec06f00171bd10f156e (diff)
add config option to hide all encryption modes
Diffstat (limited to '')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/ConversationActivity.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
index fee2df162..a47ad62a6 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
@@ -402,6 +402,7 @@ public class ConversationActivity extends XmppActivity
} else {
menuAdd.setVisible(!isConversationsOverviewHideable());
if (this.getSelectedConversation() != null) {
+ menuSecure.setVisible(!Config.HIDE_ENCRYPTION_IN_UI);
if (this.getSelectedConversation().getNextEncryption() != Message.ENCRYPTION_NONE) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
menuSecure.setIcon(R.drawable.ic_lock_white_24dp);