diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-06-01 19:08:42 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-06-01 19:08:42 +0200 |
| commit | 32a21e1ab94b625e99c125779a03ea29690f9533 (patch) | |
| tree | 882f013478c0ef296014f80ac73a905bdc6d711c /src/eu/siacs/conversations/ui/ConversationActivity.java | |
| parent | 8ea73feec405dffc47e5273ab034cb40af327a85 (diff) | |
unified crypto messages and made lock icon work for conferences
Diffstat (limited to 'src/eu/siacs/conversations/ui/ConversationActivity.java')
| -rw-r--r-- | src/eu/siacs/conversations/ui/ConversationActivity.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/eu/siacs/conversations/ui/ConversationActivity.java b/src/eu/siacs/conversations/ui/ConversationActivity.java index fbb08e71..05120a41 100644 --- a/src/eu/siacs/conversations/ui/ConversationActivity.java +++ b/src/eu/siacs/conversations/ui/ConversationActivity.java @@ -321,16 +321,16 @@ public class ConversationActivity extends XmppActivity { ((MenuItem) menu.findItem(R.id.action_add)).setVisible(!spl .isSlideable()); if (this.getSelectedConversation() != null) { + if (this.getSelectedConversation().getLatestMessage() + .getEncryption() != Message.ENCRYPTION_NONE) { + menuSecure.setIcon(R.drawable.ic_action_secure); + } if (this.getSelectedConversation().getMode() == Conversation.MODE_MULTI) { menuContactDetails.setVisible(false); menuAttach.setVisible(false); } else { menuMucDetails.setVisible(false); menuInviteContacts.setVisible(false); - if (this.getSelectedConversation().getLatestMessage() - .getEncryption() != Message.ENCRYPTION_NONE) { - menuSecure.setIcon(R.drawable.ic_action_secure); - } } } } @@ -539,7 +539,7 @@ 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); + otr.setEnabled(false); } switch (conversation.getNextEncryption()) { case Message.ENCRYPTION_NONE: |