TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-24 16:57:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1383 from jocelynthode/master

Browse Source 
Add time to messages when they are within the week
This commit is contained in:
Jake McGinty 2014-04-27 19:19:49 -07:00
commit 716519f4b8
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/org/thoughtcrime/securesms/util/DateUtils.java
View File

@ -27,7 +27,7 @@ public class DateUtils extends android.text.format.DateUtils {
prettyDate = DateUtils.formatDateTime(c, millis, DateUtils.FORMAT_SHOW_TIME | DateUtils.FORMAT_ABBREV_TIME); prettyDate = DateUtils.formatDateTime(c, millis, DateUtils.FORMAT_SHOW_TIME | DateUtils.FORMAT_ABBREV_TIME);
} else if (isWithinWeek(millis)) { } else if (isWithinWeek(millis)) {
prettyDate = DateUtils.formatDateTime(c, millis, prettyDate = DateUtils.formatDateTime(c, millis,
DateUtils.FORMAT_SHOW_WEEKDAY | DateUtils.FORMAT_ABBREV_WEEKDAY); DateUtils.FORMAT_SHOW_WEEKDAY | DateUtils.FORMAT_ABBREV_WEEKDAY | DateUtils.FORMAT_SHOW_TIME);
} else if (isWithinYear(millis)) { } else if (isWithinYear(millis)) {
prettyDate = DateUtils.formatDateTime(c, millis, prettyDate = DateUtils.formatDateTime(c, millis,
DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_NO_YEAR | DateUtils.FORMAT_ABBREV_ALL); DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_NO_YEAR | DateUtils.FORMAT_ABBREV_ALL);