ChatMessageAdapter: system date and time format used.

app/src/main/java/com/xabber/android/ui/adapter/ChatMessageAdapter.java

@@ -199,7 +199,7 @@ public class ChatMessageAdapter extends BaseAdapter implements UpdatableAdapter
 
             if (timeStamp != null) {
                 String delay = activity.getString(incoming ? R.string.chat_delay : R.string.chat_typed,
-                        StringUtils.getSmartTimeText(timeStamp));
+                        StringUtils.getSmartTimeText(activity, timeStamp));
                 append(builder, delay, new TextAppearanceSpan(activity, R.style.ChatHeader_Delay));
                 append(builder, divider, new TextAppearanceSpan(activity, R.style.ChatHeader));
             }
@@ -226,7 +226,7 @@ public class ChatMessageAdapter extends BaseAdapter implements UpdatableAdapter
         textView.setText(builder);
         textView.setMovementMethod(LinkMovementMethod.getInstance());
 
-        String time = StringUtils.getSmartTimeText(messageItem.getTimestamp());
+        String time = StringUtils.getSmartTimeText(activity, messageItem.getTimestamp());
 
         ((TextView)view.findViewById(R.id.message_time)).setText(time);
 

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

@@ -14,13 +14,12 @@
  */
 package com.xabber.android.utils;
 
+import android.content.Context;
 import android.content.res.Resources;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.util.Calendar;
 import java.util.Date;
-import java.util.GregorianCalendar;
 
 /**
  * Helper class to get plural forms.
@@ -123,25 +122,15 @@ public class StringUtils {
      * @param timeStamp
      * @return String with time or with date and time depend on current time.
      */
-    public static String getSmartTimeText(Date timeStamp) {
+    public static String getSmartTimeText(Context context, Date timeStamp) {
         if (timeStamp == null) {
             return "";
         }
 
-        // 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);
+        DateFormat timeFormat = android.text.format.DateFormat.getTimeFormat(context);
+        DateFormat dateFormat = android.text.format.DateFormat.getDateFormat(context);
 
-        if (timeStamp.getTime() > midnight.getTimeInMillis())
-            synchronized (TIME) {
-                return TIME.format(timeStamp);
-            }
-        else
-            return getDateTimeText(timeStamp);
+        return dateFormat.format(timeStamp) + " " + timeFormat.format(timeStamp);
     }
 
 }