diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-01-22 11:20:31 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2016-01-22 11:20:31 +0100 |
| commit | 40005cec1b1a864c529ead082a6e41a1471c874c (patch) | |
| tree | 8e42c210500630e14e354d9724871afc69aa2fef /src/main/java/eu/siacs/conversations/ui | |
| parent | 77c0fb0b2ae257b7bf257417ed689f2334507f2c (diff) | |
added config variable to allow non-tls connections
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui')
| -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 f54ace3d..ba6077c4 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java @@ -854,7 +854,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 && !Config.X509_VERIFICATION); - none.setVisible(!Config.FORCE_ENCRYPTION); + none.setVisible(!Config.FORCE_E2E_ENCRYPTION); otr.setVisible(!Config.X509_VERIFICATION); if (conversation.getMode() == Conversation.MODE_MULTI) { otr.setVisible(false); |