diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2014-05-22 15:36:41 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2014-05-28 10:41:55 +0200 |
| commit | fd4897e1a5a843c8b55b28b00afa6778b345c9a5 (patch) | |
| tree | 9e7ee33bbcf36a99c9dc77c45baa26bda5c75dc8 /src/eu/siacs/conversations/ui/ConversationActivity.java | |
| parent | f4ce5082b9743743b8d2623401898ce9516acbd4 (diff) | |
first tries on crypto muc
Diffstat (limited to '')
| -rw-r--r-- | src/eu/siacs/conversations/ui/ConversationActivity.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/eu/siacs/conversations/ui/ConversationActivity.java b/src/eu/siacs/conversations/ui/ConversationActivity.java index bd98e979..c696fa45 100644 --- a/src/eu/siacs/conversations/ui/ConversationActivity.java +++ b/src/eu/siacs/conversations/ui/ConversationActivity.java @@ -321,7 +321,6 @@ public class ConversationActivity extends XmppActivity { if (this.getSelectedConversation() != null) { if (this.getSelectedConversation().getMode() == Conversation.MODE_MULTI) { menuContactDetails.setVisible(false); - menuSecure.setVisible(false); menuAttach.setVisible(false); } else { menuMucDetails.setVisible(false); @@ -536,14 +535,17 @@ public class ConversationActivity extends XmppActivity { } }); popup.inflate(R.menu.encryption_choices); + MenuItem otr = popup.getMenu().findItem(R.id.encryption_choice_otr); + if (conversation.getMode() == Conversation.MODE_MULTI) { + otr.setVisible(false); + } switch (conversation.getNextEncryption()) { case Message.ENCRYPTION_NONE: popup.getMenu().findItem(R.id.encryption_choice_none) .setChecked(true); break; case Message.ENCRYPTION_OTR: - popup.getMenu().findItem(R.id.encryption_choice_otr) - .setChecked(true); + otr.setChecked(true); break; case Message.ENCRYPTION_PGP: popup.getMenu().findItem(R.id.encryption_choice_pgp) |