1 files changed, 35 insertions, 1 deletions

diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
index 38c321d0..e62aaf96 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
@@ -13,14 +13,28 @@ import android.widget.TextView;
 
 import java.util.List;
 
+import de.tzur.conversations.Settings;
+import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.entities.Conversation;
 import eu.siacs.conversations.entities.Downloadable;
 import eu.siacs.conversations.entities.DownloadableFile;
 import eu.siacs.conversations.entities.Message;
+import eu.siacs.conversations.entities.Presences;
 import eu.siacs.conversations.ui.ConversationActivity;
 import eu.siacs.conversations.ui.XmppActivity;
 import eu.siacs.conversations.utils.UIHelper;
+import android.content.Context;
+import android.graphics.Color;
+import android.graphics.Typeface;
+import android.preference.PreferenceManager;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.ImageView;
+import android.widget.TextView;
 
 public class ConversationAdapter extends ArrayAdapter<Conversation> {
 
@@ -62,6 +76,26 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
 		TextView mTimestamp = (TextView) view.findViewById(R.id.conversation_lastupdate);
 		ImageView imagePreview = (ImageView) view.findViewById(R.id.conversation_lastimage);
 
+        if (Settings.SHOW_ONLINE_STATUS) {
+            TextView status = (TextView) view.findViewById(R.id.status);
+
+            String color = "#000000";
+            switch (conversation.getContact().getMostAvailableStatus()) {
+                case Presences.ONLINE:
+                case Presences.CHAT:
+                    color = "#259B23";
+                    break;
+                case Presences.AWAY:
+                case Presences.XA:
+                    color = "#FF9800";
+                    break;
+                case Presences.DND:
+                    color = "#E51C23";
+                    break;
+            }
+            status.setBackgroundColor(Color.parseColor(color));
+        }
+
 		Message message = conversation.getLatestMessage();
 
 		if (!conversation.isRead()) {
@@ -102,4 +136,4 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
 
 		return view;
 	}
-}
\ No newline at end of file
+}