diff options
| author | Christian S <kriztan@users.noreply.github.com> | 2015-11-01 10:21:59 +0100 |
|---|---|---|
| committer | Christian S <kriztan@users.noreply.github.com> | 2015-11-01 10:21:59 +0100 |
| commit | 06b218c1a62cf8eaf71546541921812025a392fc (patch) | |
| tree | 0e95f9b07d2e03da7eebc5335b927084fab2dfff /src/main/java/eu/siacs/conversations/ui/ConversationFragment.java | |
| parent | 1e50c4c55c583612b4e1796024f87c83803c55c3 (diff) | |
| parent | fb9ba0a734c4b854918f1c58940977c6037a6afa (diff) | |
Merge pull request #47 from siacs/master
copy commits
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/ConversationFragment.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ConversationFragment.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java index fd3426ca7..9904f3e12 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java @@ -46,6 +46,7 @@ import java.util.concurrent.ConcurrentLinkedQueue; import eu.siacs.conversations.Config; import eu.siacs.conversations.R; import eu.siacs.conversations.crypto.PgpEngine; +import eu.siacs.conversations.crypto.axolotl.AxolotlService; import eu.siacs.conversations.entities.Account; import eu.siacs.conversations.entities.Contact; import eu.siacs.conversations.entities.Conversation; @@ -363,7 +364,12 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa mEditMessage.setHint(getString(R.string.send_otr_message)); break; case Message.ENCRYPTION_AXOLOTL: - mEditMessage.setHint(getString(R.string.send_omemo_message)); + AxolotlService axolotlService = conversation.getAccount().getAxolotlService(); + if (axolotlService.trustedSessionVerified(conversation)) { + mEditMessage.setHint(getString(R.string.send_omemo_x509_message)); + } else { + mEditMessage.setHint(getString(R.string.send_omemo_message)); + } break; case Message.ENCRYPTION_PGP: mEditMessage.setHint(getString(R.string.send_pgp_message)); |