diff options
| author | Christian S <kriztan@users.noreply.github.com> | 2015-11-01 10:21:59 +0100 |
|---|---|---|
| committer | Christian S <kriztan@users.noreply.github.com> | 2015-11-01 10:21:59 +0100 |
| commit | 06b218c1a62cf8eaf71546541921812025a392fc (patch) | |
| tree | 0e95f9b07d2e03da7eebc5335b927084fab2dfff /src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java | |
| parent | 1e50c4c55c583612b4e1796024f87c83803c55c3 (diff) | |
| parent | fb9ba0a734c4b854918f1c58940977c6037a6afa (diff) | |
Merge pull request #47 from siacs/master
copy commits
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java index 039efe3c5..10fa3c18f 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java @@ -187,7 +187,7 @@ public class MessageAdapter extends ArrayAdapter<Message> { .getAccount().getAxolotlService().getFingerprintTrust( message.getAxolotlFingerprint()); - if(trust == null || trust != XmppAxolotlSession.Trust.TRUSTED) { + if(trust == null || (!trust.trusted() && !trust.trustedInactive())) { viewHolder.indicator.setColorFilter(activity.getWarningTextColor()); viewHolder.indicator.setAlpha(1.0f); } else { |