diff options
| author | Christian S <christian@pix-art.de> | 2015-12-16 19:55:31 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2015-12-16 19:55:31 +0100 |
| commit | 081c5e4a1c8de7053d394d60c9afc82b9ea6a892 (patch) | |
| tree | d5680195ef37ac6b9da16f309a49419ac7ed01d9 /src/main/java/eu/siacs/conversations/ui/ConversationActivity.java | |
| parent | efaa1223b6e002d5afba0462d57ff30be91dd0e5 (diff) | |
| parent | 43dd681239ea5a287f5761597de5dcdc4daed3de (diff) | |
copy commits
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/ConversationActivity.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ConversationActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java index 547f977ba..47edd1a42 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java @@ -923,7 +923,7 @@ public class ConversationActivity extends XmppActivity MenuItem pgp = popup.getMenu().findItem(R.id.encryption_choice_pgp); MenuItem axolotl = popup.getMenu().findItem(R.id.encryption_choice_axolotl); pgp.setVisible(!Config.HIDE_PGP_IN_UI); - none.setVisible(!Config.PARANOID_MODE); + none.setVisible(!Config.FORCE_ENCRYPTION); if (conversation.getMode() == Conversation.MODE_MULTI) { otr.setVisible(false); axolotl.setVisible(false); |