diff options
author | Daniel Gultsch <daniel@gultsch.de> | 2016-06-16 12:12:24 +0200 |
---|---|---|
committer | Daniel Gultsch <daniel@gultsch.de> | 2016-06-16 12:12:24 +0200 |
commit | 48a7818e883697913cc0a48960999d176ce8f5c0 (patch) | |
tree | 8c92b212da7197e124ac549abdd763f1f5b26386 /src/main/java/eu/siacs/conversations/ui/ConversationFragment.java | |
parent | 1eb776f39ca02183c406e0931dcab04ad9539ac5 (diff) |
mark used otr fingprint in contact details and highlight pgp
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/ConversationFragment.java')
-rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ConversationFragment.java | 18 |
1 files changed, 16 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 9c2a7d08..eef7e703 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java @@ -449,7 +449,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 { @@ -461,7 +468,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); } |