From 12db8cb60b29c54030e32eef6a8c4b1954b1ade1 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Thu, 13 Apr 2017 23:17:03 +0200
Subject: set colored contact status preference correctly

---
 src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/main/java/de/pixart/messenger')

diff --git a/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java
index 9873431ef..00c612e20 100644
--- a/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java
+++ b/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java
@@ -96,14 +96,18 @@ public class ListItemAdapter extends ArrayAdapter<ListItem> {
                 color = tag.getColor();
             }
         }
-        if (offline || !ShowPresenceColoredNames()) {
+        if (offline) {
             tvName.setTextColor(ContextCompat.getColor(activity, R.color.black87));
             tvName.setAlpha(INACTIVE_ALPHA);
             tvJid.setAlpha(INACTIVE_ALPHA);
             picture.setAlpha(INACTIVE_ALPHA);
             tagLayout.setAlpha(INACTIVE_ALPHA);
         } else {
-            tvName.setTextColor(color);
+            if (ShowPresenceColoredNames()) {
+                tvName.setTextColor(color);
+            } else {
+                tvName.setTextColor(ContextCompat.getColor(activity, R.color.black87));
+            }
             tvName.setAlpha(ACTIVE_ALPHA);
             tvJid.setAlpha(ACTIVE_ALPHA);
             picture.setAlpha(ACTIVE_ALPHA);
-- 
cgit v1.2.3