diff options
| author | Christian Schneppe <christian@pix-art.de> | 2017-02-06 23:00:50 +0100 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2017-02-06 23:00:50 +0100 |
| commit | 20bf107a79a9da5e8815d9c070f4d33bfbf05b27 (patch) | |
| tree | 00032b06a6741b0faae2be7f027f1439c5380c1e /src/main/java | |
| parent | 024de5b3119ad8694e8fa2f523c13aba148127e9 (diff) | |
correct view of encrypted messages
fixes #99
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/de/pixart/messenger/ui/XmppActivity.java | 4 | ||||
| -rw-r--r-- | src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/XmppActivity.java b/src/main/java/de/pixart/messenger/ui/XmppActivity.java index 9a9ad43a5..31d976584 100644 --- a/src/main/java/de/pixart/messenger/ui/XmppActivity.java +++ b/src/main/java/de/pixart/messenger/ui/XmppActivity.java @@ -968,10 +968,6 @@ public abstract class XmppActivity extends Activity { return this.mColorRed; } - public int getUnencryptedTextColor() { - return this.mColorWhite; - } - public int getOnlineColor() { return this.mColorGreen; } 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<Message> 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<Message> 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; } } |