diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-02-02 18:15:57 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2016-02-02 18:15:57 +0100 |
| commit | 01bad127084cdfc623c57be18e123ef8ff6655b0 (patch) | |
| tree | 469fb706c1c32bb02ae47309c54b9d478b21ff69 /src | |
| parent | 58c6f9bfb283f5c54695b9662b5b4b08e5d4357f (diff) | |
fixed 'unencrypted' not showing up for conferences when encryption is forced
Diffstat (limited to 'src')
| -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 b4857067f..2461c39d9 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_E2E_ENCRYPTION); + none.setVisible(!Config.FORCE_E2E_ENCRYPTION || conversation.getMode() == Conversation.MODE_MULTI); otr.setVisible(!Config.X509_VERIFICATION); if (conversation.getMode() == Conversation.MODE_MULTI) { otr.setVisible(false); |