From 2b0925471c51a8db18058db7d3116121d63946cb Mon Sep 17 00:00:00 2001
From: Alex Baker <baker.alex@gmail.com>
Date: Wed, 26 Feb 2014 10:35:06 -0600
Subject: [PATCH] Only use date shorcuts six days out

Closes #98
---
 .../com/todoroo/andlib/utility/DateUtilities.java  |  6 ++----
 .../todoroo/andlib/utility/RelativeDayTest.java    | 14 +++++++-------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/api/src/main/java/com/todoroo/andlib/utility/DateUtilities.java b/api/src/main/java/com/todoroo/andlib/utility/DateUtilities.java
index 4b6a7eab3..b878bbf86 100644
--- a/api/src/main/java/com/todoroo/andlib/utility/DateUtilities.java
+++ b/api/src/main/java/com/todoroo/andlib/utility/DateUtilities.java
@@ -23,9 +23,7 @@ import static org.tasks.date.DateTimeUtils.newDate;
 
 public class DateUtilities {
 
-    /* ======================================================================
-     * ============================================================ long time
-     * ====================================================================== */
+    private static final long abbreviationLimit = DateUtilities.ONE_DAY  * 6;
 
     /**
      * Add the specified amount of months to the given time.<br/>
@@ -205,7 +203,7 @@ public class DateUtilities {
             return context.getString(abbreviated ? R.string.yest : R.string.yesterday).toLowerCase();
         }
 
-        if(today + DateUtilities.ONE_WEEK >= input && today - DateUtilities.ONE_WEEK <= input) {
+        if(today + abbreviationLimit >= input && today - abbreviationLimit <= input) {
             return abbreviated ? DateUtilities.getWeekdayShort(newDate(date)) : DateUtilities.getWeekday(newDate(date));
         }
 
diff --git a/astrid/src/test/java/com/todoroo/andlib/utility/RelativeDayTest.java b/astrid/src/test/java/com/todoroo/andlib/utility/RelativeDayTest.java
index cbc09707b..171f6fd3b 100644
--- a/astrid/src/test/java/com/todoroo/andlib/utility/RelativeDayTest.java
+++ b/astrid/src/test/java/com/todoroo/andlib/utility/RelativeDayTest.java
@@ -59,19 +59,19 @@ public class RelativeDayTest {
     }
 
     @Test
-    public void relativeDayOneWeek() {
-        checkRelativeDay(now().minusDays(7), "Tuesday", "Tue");
-        checkRelativeDay(now().plusDays(7), "Tuesday", "Tue");
+    public void relativeDaySix() {
+        checkRelativeDay(now().minusDays(6), "Wednesday", "Wed");
+        checkRelativeDay(now().plusDays(6), "Monday", "Mon");
     }
 
     @Test
-    public void relativeDayMoreThanOneWeek() {
-        checkRelativeDay(now().minusDays(8), "Dec 23", "Dec 23");
+    public void relativeDayOneWeek() {
+        checkRelativeDay(now().minusDays(7), "Dec 24", "Dec 24");
     }
 
     @Test
-    public void relativeDayNextYear() {
-        checkRelativeDay(now().plusDays(8), "Jan 8\n2014", "Jan 8\n2014");
+    public void relativeDayOneWeekNextYear() {
+        checkRelativeDay(now().plusDays(7), "Jan 7\n2014", "Jan 7\n2014");
     }
 
     private void checkRelativeDay(DateTime now, String full, String abbreviated) {