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/ConversationFragment.java | |
| parent | 8ea73feec405dffc47e5273ab034cb40af327a85 (diff) | |
unified crypto messages and made lock icon work for conferences
Diffstat (limited to 'src/eu/siacs/conversations/ui/ConversationFragment.java')
| -rw-r--r-- | src/eu/siacs/conversations/ui/ConversationFragment.java | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/src/eu/siacs/conversations/ui/ConversationFragment.java b/src/eu/siacs/conversations/ui/ConversationFragment.java index f23a6bfe..7d82dcd4 100644 --- a/src/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/eu/siacs/conversations/ui/ConversationFragment.java @@ -124,22 +124,18 @@ public class ConversationFragment extends Fragment { } public void updateChatMsgHint() { - if (conversation.getMode() == Conversation.MODE_MULTI) { - chatMsg.setHint(getString(R.string.send_message_to_conference)); - } else { - switch (conversation.getNextEncryption()) { - case Message.ENCRYPTION_NONE: - chatMsg.setHint(getString(R.string.send_plain_text_message)); - break; - case Message.ENCRYPTION_OTR: - chatMsg.setHint(getString(R.string.send_otr_message)); - break; - case Message.ENCRYPTION_PGP: - chatMsg.setHint(getString(R.string.send_pgp_message)); - break; - default: - break; - } + switch (conversation.getNextEncryption()) { + case Message.ENCRYPTION_NONE: + chatMsg.setHint(getString(R.string.send_plain_text_message)); + break; + case Message.ENCRYPTION_OTR: + chatMsg.setHint(getString(R.string.send_otr_message)); + break; + case Message.ENCRYPTION_PGP: + chatMsg.setHint(getString(R.string.send_pgp_message)); + break; + default: + break; } } |