From efdbbf1c0703cb8f0a13b9f882eabe2c3d71b4ba Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Thu, 16 Jun 2016 12:12:24 +0200 Subject: mark used otr fingprint in contact details and highlight pgp --- .../siacs/conversations/ui/ConversationFragment.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'src/main/java/eu/siacs/conversations/ui/ConversationFragment.java') diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java index df11918f6..9874db8af 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java @@ -460,7 +460,14 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa } } else { if (!message.getContact().isSelf()) { - activity.switchToContactDetails(message.getContact(), message.getFingerprint()); + String fingerprint; + if (message.getEncryption() == Message.ENCRYPTION_PGP + || message.getEncryption() == Message.ENCRYPTION_DECRYPTED) { + fingerprint = "pgp"; + } else { + fingerprint = message.getFingerprint(); + } + activity.switchToContactDetails(message.getContact(), fingerprint); } } } else { @@ -472,7 +479,14 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa } else { intent = new Intent(activity, EditAccountActivity.class); intent.putExtra("jid", account.getJid().toBareJid().toString()); - intent.putExtra("fingerprint", message.getFingerprint()); + String fingerprint; + if (message.getEncryption() == Message.ENCRYPTION_PGP + || message.getEncryption() == Message.ENCRYPTION_DECRYPTED) { + fingerprint = "pgp"; + } else { + fingerprint = message.getFingerprint(); + } + intent.putExtra("fingerprint", fingerprint); } startActivity(intent); } -- cgit v1.2.3