Show Online status in contact list with respect to SHOW_ONLINE_STATUS preference

Conflicts:
	src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java

1 files changed, 4 insertions, 2 deletions

diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java
index 5bc67b8b..10500bfc 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java
@@ -58,8 +58,10 @@ public class ListItemAdapter extends ArrayAdapter<ListItem> {
 			view = inflater.inflate(R.layout.contact, parent, false);
 		}
 
-		TextView tvStatus = (TextView) view.findViewById(R.id.contact_status);
-		tvStatus.setBackgroundColor(item.getStatusColor());
+		if (Settings.SHOW_ONLINE_STATUS) {
+			TextView tvStatus = (TextView) view.findViewById(R.id.contact_status);
+			tvStatus.setBackgroundColor(item.getStatusColor());
+		}
 
 		TextView tvName = (TextView) view.findViewById(R.id.contact_display_name);
 		TextView tvJid = (TextView) view.findViewById(R.id.contact_jid);