1 files changed, 21 insertions, 5 deletions
diff --git a/src/main/java/eu/siacs/conversations/utils/UIHelper.java b/src/main/java/eu/siacs/conversations/utils/UIHelper.java
index cac23f07..44a38728 100644
--- a/src/main/java/eu/siacs/conversations/utils/UIHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/UIHelper.java
@@ -11,11 +11,13 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.Locale;
 
+import eu.siacs.conversations.Config;
 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.Presences;
 import eu.siacs.conversations.entities.Transferable;
+import eu.siacs.conversations.entities.Message;
 import eu.siacs.conversations.xmpp.jid.Jid;
 
 public class UIHelper {
@@ -190,7 +192,7 @@ public class UIHelper {
 					return new Pair<>(context.getString(R.string.location), true);
 				}
 			} else{
-				return new Pair<>(message.getBody().trim(), false);
+				return new Pair<>(message.getBody(), false);
 			}
 		}
 	}
@@ -241,13 +243,27 @@ public class UIHelper {
 		}
 	}
 
+	public static String getStatusColor(int status) {
+		switch (status) {
+			case Presences.ONLINE:
+			case Presences.CHAT:
+				return "#259B23";
+			case Presences.AWAY:
+			case Presences.XA:
+				return "#FF9800";
+			case Presences.DND:
+				return "#E51C23";
+		}
+		return "#CCCCCC";
+	}
+
 	private static String getDisplayedMucCounterpart(final Jid counterpart) {
 		if (counterpart==null) {
 			return "";
 		} else if (!counterpart.isBareJid()) {
-			return counterpart.getResourcepart().trim();
+			return counterpart.getResourcepart();
 		} else {
-			return counterpart.toString().trim();
+			return counterpart.toString();
 		}
 	}
 
@@ -257,7 +273,7 @@ public class UIHelper {
 				|| message.getType() != Message.TYPE_TEXT) {
 			return false;
 		}
-		String body = message.getBody() == null ? null : message.getBody().trim().toLowerCase(Locale.getDefault());
+		String body = message.getBody() == null ? null : message.getBody().toLowerCase(Locale.getDefault());
 		body = body.replace("?","").replace("¿","");
 		return LOCATION_QUESTIONS.contains(body);
 	}