From 20bf107a79a9da5e8815d9c070f4d33bfbf05b27 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Mon, 6 Feb 2017 23:00:50 +0100 Subject: correct view of encrypted messages fixes #99 --- src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java') diff --git a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java index b125a9f0b..058da3c33 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java +++ b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java @@ -260,8 +260,6 @@ public class MessageAdapter extends ArrayAdapter implements CopyTextVie }); } else if (!error && type == SENT) { viewHolder.resend_button.setVisibility(View.GONE); - } else if (!message.isValidInSession() && type == RECEIVED) { - viewHolder.time.setTextColor(activity.getUnencryptedTextColor()); } else { viewHolder.time.setTextColor(this.getMessageTextColor(darkBackground, false)); } @@ -270,10 +268,10 @@ public class MessageAdapter extends ArrayAdapter implements CopyTextVie } else { boolean verified = false; if (message.getEncryption() == Message.ENCRYPTION_AXOLOTL) { - final FingerprintStatus status = message.getConversation() + FingerprintStatus status = message.getConversation() .getAccount().getAxolotlService().getFingerprintTrust( message.getFingerprint()); - if (status != null && status.isVerified()) { + if (status != null && status.isTrustedAndActive()) { verified = true; } } -- cgit v1.2.3