1 files changed, 37 insertions, 10 deletions

diff --git a/src/main/java/eu/siacs/conversations/utils/UIHelper.java b/src/main/java/eu/siacs/conversations/utils/UIHelper.java
index 5e8af085..871e4323 100644
--- a/src/main/java/eu/siacs/conversations/utils/UIHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/UIHelper.java
@@ -5,6 +5,7 @@ import android.text.format.DateFormat;
 import android.text.format.DateUtils;
 import android.util.Pair;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
@@ -15,17 +16,13 @@ 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;
 
 public class UIHelper {
 
-	private static String BLACK_HEART_SUIT = "\u2665";
-	private static String HEAVY_BLACK_HEART_SUIT = "\u2764";
-	private static String WHITE_HEART_SUIT = "\u2661";
-
-	public static final ArrayList<String> HEARTS = new ArrayList<>(Arrays.asList(BLACK_HEART_SUIT,HEAVY_BLACK_HEART_SUIT,WHITE_HEART_SUIT));
-
 	private static final ArrayList<String> LOCATION_QUESTIONS = new ArrayList<>(Arrays.asList(
 			"where are you", //en
 			"where are you now", //en
@@ -192,7 +189,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);
 			}
 		}
 	}
@@ -243,13 +240,27 @@ public class UIHelper {
 		}
 	}
 
+	public static String getStatusColor(Presence.Status status) {
+		switch (status) {
+			case ONLINE:
+			case CHAT:
+				return "#259B23";
+			case AWAY:
+			case XA:
+				return "#FF9800";
+			case 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();
 		}
 	}
 
@@ -259,8 +270,24 @@ 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);
 	}
+
+	public static String getHumanReadableFileSize(long filesize) {
+        if (0 > filesize) {
+            return "?";
+        }
+        double size = Double.valueOf(filesize);
+        String[] sizes = {" bytes", " Kb", " Mb", " Gb", " Tb"};
+        int i = 0;
+        while (1023 < size) {
+            size /= 1024d;
+            ++i;
+        }
+        BigDecimal readableSize = new BigDecimal(size);
+        readableSize = readableSize.setScale(2, BigDecimal.ROUND_HALF_UP);
+        return readableSize.doubleValue() + sizes[i];
+	}
 }