From bb065020ff6145adf8fb2726928f11e0ea7140b6 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Mon, 22 Sep 2014 11:00:46 +0200
Subject: don't show time stamp within the last 6 hours of a new day

---
 src/eu/siacs/conversations/utils/UIHelper.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/eu/siacs/conversations')

diff --git a/src/eu/siacs/conversations/utils/UIHelper.java b/src/eu/siacs/conversations/utils/UIHelper.java
index 3a191b9ad..f6e66cdb7 100644
--- a/src/eu/siacs/conversations/utils/UIHelper.java
+++ b/src/eu/siacs/conversations/utils/UIHelper.java
@@ -78,7 +78,7 @@ public class UIHelper {
 		} else if (difference < 60 * 15) {
 			return context.getString(R.string.minutes_ago,
 					Math.round(difference / 60.0));
-		} else if (today(date) || difference < 6 * 60 * 60) {
+		} else if (today(date)) {
 			java.text.DateFormat df = DateFormat.getTimeFormat(context);
 			return df.format(date);
 		} else {
-- 
cgit v1.2.3