StringUtils: time format changed (for chats).

app/src/main/java/com/xabber/android/utils/StringUtils.java

@@ -14,10 +14,13 @@
  */
 package com.xabber.android.utils;
 
+import android.content.res.Resources;
+
 import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.Date;
-
-import android.content.res.Resources;
+import java.util.GregorianCalendar;
 
 /**
  * Helper class to get plural forms.
@@ -32,7 +35,7 @@ public class StringUtils {
     static {
         DATE_TIME = DateFormat.getDateTimeInstance(DateFormat.MEDIUM,
                 DateFormat.SHORT);
-        TIME = DateFormat.getTimeInstance(DateFormat.MEDIUM);
+        TIME = new SimpleDateFormat("H:mm");
     }
 
     private StringUtils() {
@@ -121,11 +124,19 @@ public class StringUtils {
      * @return String with time or with date and time depend on current time.
      */
     public static String getSmartTimeText(Date timeStamp) {
-        if (timeStamp == null)
+        if (timeStamp == null) {
             return "";
-        Date date = new Date();
-        long delta = date.getTime() - timeStamp.getTime();
-        if (delta < 20 * 60 * 60 * 1000)
+        }
+
+        // today
+        Calendar midnight = new GregorianCalendar();
+        // reset hour, minutes, seconds and millis
+        midnight.set(Calendar.HOUR_OF_DAY, 0);
+        midnight.set(Calendar.MINUTE, 0);
+        midnight.set(Calendar.SECOND, 0);
+        midnight.set(Calendar.MILLISECOND, 0);
+
+        if (timeStamp.getTime() > midnight.getTimeInMillis())
             synchronized (TIME) {
                 return TIME.format(timeStamp);
             }