aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-09-22 11:00:46 +0200
committeriNPUTmice <daniel@gultsch.de>2014-09-22 11:00:46 +0200
commitbb065020ff6145adf8fb2726928f11e0ea7140b6 (patch)
tree67612c2b31eda5e1b39330d1e27f046c60b1f74a /src
parentc2bc15f5bacd636d3a6ffefe43c057022018e1d2 (diff)
don't show time stamp within the last 6 hours of a new day
Diffstat (limited to 'src')
-rw-r--r--src/eu/siacs/conversations/utils/UIHelper.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/eu/siacs/conversations/utils/UIHelper.java b/src/eu/siacs/conversations/utils/UIHelper.java
index 3a191b9a..f6e66cdb 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 {