diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-05-25 22:12:13 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2016-05-25 22:12:13 +0200 |
| commit | 83adbb6052104be0c5519e9a8312a1a780718442 (patch) | |
| tree | cbbe2be7eec1673204d15ab425e2401dc92424fa /src/main/java/eu/siacs/conversations/ui/ConversationFragment.java | |
| parent | 5137837f6d99ea5c9cc2b1b50515f545da0f7b0f (diff) | |
hide fingerprints in UI if encryption is disabled
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/ConversationFragment.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ConversationFragment.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java index 60514d20..5d5e4c29 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java @@ -390,8 +390,11 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa } else { switch (conversation.getNextEncryption()) { case Message.ENCRYPTION_NONE: - mEditMessage - .setHint(getString(R.string.send_unencrypted_message)); + if (Config.multipleEncryptionChoices()) { + mEditMessage.setHint(getString(R.string.send_unencrypted_message)); + } else { + mEditMessage.setHint(getString(R.string.send_message_to_x,conversation.getName())); + } break; case Message.ENCRYPTION_OTR: mEditMessage.setHint(getString(R.string.send_otr_message)); |