diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-06-16 12:12:24 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-06-19 20:12:30 +0200 |
| commit | efdbbf1c0703cb8f0a13b9f882eabe2c3d71b4ba (patch) | |
| tree | 778e6d20ae0d3b3e656ed360f2e0a8b50631b2ae /src/main/java/eu/siacs/conversations/ui/ConversationFragment.java | |
| parent | 87c28ba818428ac2b73a7c9add86de66a6d1d066 (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 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); } |