aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2014-07-11 13:12:25 +0200
committerDaniel Gultsch <daniel@gultsch.de>2014-07-11 13:12:25 +0200
commit8ebd14cef4e140b6873155de7dbfb66d91711ead (patch)
tree3b4d6e72d7c58634957dc28372456fee0d3f83ad /src
parent355a6d172371fecadff12d5b4853a1f36b35a01f (diff)
parent1da0845d5235f5754aae36216bbb7ca24ffc51bf (diff)
Merge pull request #262 from kruks23/development
Show time in messages previous days
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 059d9fad..97accb58 100644
--- a/src/eu/siacs/conversations/utils/UIHelper.java
+++ b/src/eu/siacs/conversations/utils/UIHelper.java
@@ -69,7 +69,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)) {
+ } else if (today(date) || difference < 12 * 60 * 60) {
java.text.DateFormat df = DateFormat.getTimeFormat(context);
return df.format(date);
} else {