2 files changed, 12 insertions, 11 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 9c3b5430..2e40717a 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
@@ -74,15 +74,15 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
             String color = "#000000";
             if (conversation.getMode() == Conversation.MODE_SINGLE) {
                 switch (conversation.getContact().getMostAvailableStatus()) {
-                    case Presences.ONLINE:
-                    case Presences.CHAT:
+                    case ONLINE:
+                    case CHAT:
                         color = "#259B23";
                         break;
-                    case Presences.AWAY:
-                    case Presences.XA:
+                    case AWAY:
+                    case XA:
                         color = "#FF9800";
                         break;
-                    case Presences.DND:
+                    case DND:
                         color = "#E51C23";
                         break;
                 }
diff --git a/src/main/java/eu/siacs/conversations/utils/UIHelper.java b/src/main/java/eu/siacs/conversations/utils/UIHelper.java
index ae5d97d9..bc64dd5e 100644
--- a/src/main/java/eu/siacs/conversations/utils/UIHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/UIHelper.java
@@ -16,6 +16,7 @@ import eu.siacs.conversations.R;
 import eu.siacs.conversations.entities.Contact;
 import eu.siacs.conversations.entities.Conversation;
 import eu.siacs.conversations.entities.Message;
+import eu.siacs.conversations.entities.Presence;
 import eu.siacs.conversations.entities.Presences;
 import eu.siacs.conversations.entities.Transferable;
 import eu.siacs.conversations.xmpp.jid.Jid;
@@ -243,15 +244,15 @@ public class UIHelper {
 		}
 	}
 
-	public static String getStatusColor(int status) {
+	public static String getStatusColor(Presence.Status status) {
 		switch (status) {
-			case Presences.ONLINE:
-			case Presences.CHAT:
+			case ONLINE:
+			case CHAT:
 				return "#259B23";
-			case Presences.AWAY:
-			case Presences.XA:
+			case AWAY:
+			case XA:
 				return "#FF9800";
-			case Presences.DND:
+			case DND:
 				return "#E51C23";
 		}
 		return "#CCCCCC";