Add newDate helper methods

api/src/main/java/com/todoroo/andlib/utility/DateUtilities.java

@@ -19,6 +19,7 @@ import java.util.Date;
 import java.util.Locale;
 
 import static org.tasks.date.DateTimeUtils.currentTimeMillis;
+import static org.tasks.date.DateTimeUtils.newDate;
 
 
 public class DateUtilities {
@@ -57,7 +58,7 @@ public class DateUtilities {
 
     /** Returns unixtime one month from now */
     public static long oneMonthFromNow() {
-        Date date = new Date(now());
+        Date date = newDate();
         date.setMonth(date.getMonth() + 1);
         return date.getTime();
     }

api/src/main/java/com/todoroo/astrid/api/PermaSql.java

@@ -9,6 +9,8 @@ import com.todoroo.andlib.utility.DateUtilities;
 
 import java.util.Date;
 
+import static org.tasks.date.DateTimeUtils.newDate;
+
 /**
  * PermaSql allows for creating SQL statements that can be saved and used
  * later without dates getting stale. It also allows these values to be

api/src/main/java/com/todoroo/astrid/data/RemoteModel.java

@@ -23,7 +23,8 @@ import org.json.JSONObject;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.util.Date;
+
+import static org.tasks.date.DateTimeUtils.newDate;
 
 /**
  * A model that is synchronized to a remote server and has a remote id

api/src/main/java/com/todoroo/astrid/data/Task.java

@@ -23,6 +23,8 @@ import org.tasks.api.R;
 
 import java.util.Date;
 
+import static org.tasks.date.DateTimeUtils.newDate;
+
 /**
  * Data Model which represents a task users need to accomplish.
  *

api/src/main/java/com/todoroo/astrid/sync/SyncProviderPreferences.java

@@ -26,10 +26,11 @@ import com.todoroo.andlib.utility.TodorooPreferenceActivity;
 
 import org.tasks.api.R;
 
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Set;
 
+import static org.tasks.date.DateTimeUtils.newDate;
+
 /**
  * Utility class for common synchronization action: displaying synchronization
  * preferences and an action panel so users can initiate actions from the menu.

api/src/main/java/org/tasks/date/DateTimeUtils.java

@@ -1,9 +1,31 @@
 package org.tasks.date;
 
+import java.util.Date;
+
 public class DateTimeUtils {
 
     public static long currentTimeMillis() {
         return org.joda.time.DateTimeUtils.currentTimeMillis();
     }
 
+    public static Date newDate() {
+        return newDate(currentTimeMillis());
+    }
+
+    public static Date newDate(long date) {
+        return new Date(date);
+    }
+
+    public static Date newDate(int year, int month, int day) {
+        return new Date(year - 1900, month - 1, day);
+    }
+
+    public static Date newDate(int year, int month, int day, int hour, int minute, int second) {
+        return new Date(year - 1900, month - 1, day, hour, minute, second);
+    }
+
+    public static Date newDateUtc(int year, int month, int day, int hour, int minute, int second) {
+        return newDate(Date.UTC(year - 1900, month - 1, day, hour, minute, second));
+    }
+
 }

astrid/src/instrumentTest/java/com/todoroo/astrid/backup/BackupServiceTests.java

@@ -19,7 +19,8 @@ import java.io.File;
 import java.io.IOException;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.util.Date;
+
+import static org.tasks.date.DateTimeUtils.newDate;
 
 public class BackupServiceTests extends DatabaseTestCase {
 

astrid/src/instrumentTest/java/com/todoroo/astrid/reminders/NotificationTests.java

@@ -18,7 +18,7 @@ import com.todoroo.astrid.test.DatabaseTestCase;
 
 import org.tasks.R;
 
-import java.util.Date;
+import static org.tasks.date.DateTimeUtils.newDate;
 
 public class NotificationTests extends DatabaseTestCase {
 

astrid/src/instrumentTest/java/com/todoroo/astrid/reminders/ReminderServiceTests.java

@@ -13,7 +13,7 @@ import com.todoroo.astrid.reminders.ReminderService.AlarmScheduler;
 import com.todoroo.astrid.test.DatabaseTestCase;
 import com.todoroo.astrid.utility.AstridPreferences;
 
-import java.util.Date;
+import static org.tasks.date.DateTimeUtils.newDate;
 
 public class ReminderServiceTests extends DatabaseTestCase {
 

astrid/src/instrumentTest/java/com/todoroo/astrid/repeats/NewRepeatTests.java

@@ -31,6 +31,8 @@ import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 
+import static org.tasks.date.DateTimeUtils.newDate;
+
 public class NewRepeatTests<REMOTE_MODEL> extends DatabaseTestCase {
 
     @Autowired

astrid/src/instrumentTest/java/com/todoroo/astrid/service/TitleParserTest.java

@@ -19,6 +19,8 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 
+import static org.tasks.date.DateTimeUtils.newDate;
+
 public class TitleParserTest extends DatabaseTestCase {
 
     @Override

astrid/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java

@@ -75,12 +75,13 @@ import org.tasks.R;
 
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Random;
 import java.util.concurrent.atomic.AtomicReference;
 
+import static org.tasks.date.DateTimeUtils.newDate;
+
 /**
  * Adapter for displaying a user's tasks as a list
  *

astrid/src/main/java/com/todoroo/astrid/alarms/AlarmControlSet.java

@@ -27,6 +27,8 @@ import org.tasks.R;
 import java.util.Date;
 import java.util.LinkedHashSet;
 
+import static org.tasks.date.DateTimeUtils.newDate;
+
 /**
  * Control set to manage adding and removing tags
  *

astrid/src/main/java/com/todoroo/astrid/alarms/AlarmDetailExposer.java

@@ -18,6 +18,8 @@ import com.todoroo.astrid.data.Metadata;
 
 import java.util.Date;
 
+import static org.tasks.date.DateTimeUtils.newDate;
+
 /**
  * Exposes Task Detail for tags, i.e. "Tags: frogs, animals"
  *

astrid/src/main/java/com/todoroo/astrid/alarms/AlarmService.java

@@ -30,9 +30,10 @@ import com.todoroo.astrid.service.MetadataService.SynchronizeMetadataCallback;
 import com.todoroo.astrid.utility.Constants;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.LinkedHashSet;
 
+import static org.tasks.date.DateTimeUtils.newDate;
+
 /**
  * Provides operations for working with alerts
  *

astrid/src/main/java/com/todoroo/astrid/backup/BackupDateUtilities.java

@@ -12,6 +12,8 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+import static org.tasks.date.DateTimeUtils.newDate;
+
 /**
  * Date Utility functions for backups
  *

astrid/src/main/java/com/todoroo/astrid/backup/BackupPreferences.java

@@ -24,6 +24,8 @@ import org.tasks.R;
 
 import java.util.Date;
 
+import static org.tasks.date.DateTimeUtils.newDate;
+
 /**
  * Displays synchronization preferences and an action panel so users can
  * initiate actions from the menu.

astrid/src/main/java/com/todoroo/astrid/calls/PhoneStateChangedReceiver.java

@@ -24,6 +24,8 @@ import org.tasks.R;
 
 import java.util.Date;
 
+import static org.tasks.date.DateTimeUtils.newDate;
+
 public class PhoneStateChangedReceiver extends BroadcastReceiver {
 
     private static final String PREF_LAST_INCOMING_NUMBER = "last_incoming_number";

astrid/src/main/java/com/todoroo/astrid/files/FileUtilities.java

@@ -19,6 +19,8 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.concurrent.atomic.AtomicReference;
 
+import static org.tasks.date.DateTimeUtils.newDate;
+
 public class FileUtilities {
 
     /**

astrid/src/main/java/com/todoroo/astrid/gcal/CalendarAlarmScheduler.java

@@ -15,7 +15,7 @@ import com.todoroo.astrid.utility.Constants;
 
 import org.tasks.R;
 
-import java.util.Date;
+import static org.tasks.date.DateTimeUtils.newDate;
 
 public class CalendarAlarmScheduler {
 

astrid/src/main/java/com/todoroo/astrid/gcal/CalendarReminderActivity.java

@@ -32,7 +32,7 @@ import com.todoroo.astrid.utility.Constants;
 
 import org.tasks.R;
 
-import java.util.Date;
+import static org.tasks.date.DateTimeUtils.newDate;
 
 public class CalendarReminderActivity extends Activity {
 

astrid/src/main/java/com/todoroo/astrid/gtasks/api/GtasksApiUtilities.java

@@ -10,6 +10,8 @@ import com.google.api.client.util.DateTime;
 import java.util.Date;
 import java.util.TimeZone;
 
+import static org.tasks.date.DateTimeUtils.newDate;
+
 public class GtasksApiUtilities {
 
     public static DateTime unixTimeToGtasksCompletionTime(long time) {

astrid/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java

@@ -51,6 +51,8 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import static org.tasks.date.DateTimeUtils.newDate;
+
 public class GtasksSyncV2Provider extends SyncV2Provider {
 
     @Autowired TaskService taskService;

astrid/src/main/java/com/todoroo/astrid/notes/EditNoteActivity.java

@@ -63,10 +63,11 @@ import org.tasks.R;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
 
+import static org.tasks.date.DateTimeUtils.newDate;
+
 public class EditNoteActivity extends LinearLayout implements TimerActionListener {
 
     private Task task;

astrid/src/main/java/com/todoroo/astrid/reminders/NotificationFragment.java

@@ -30,6 +30,8 @@ import org.tasks.R;
 
 import java.util.Date;
 
+import static org.tasks.date.DateTimeUtils.newDate;
+
 /**
  * This activity is launched when a user opens up a notification from the
  * tray. It launches the appropriate activity based on the passed in parameters.

astrid/src/main/java/com/todoroo/astrid/reminders/Notifications.java

@@ -44,11 +44,12 @@ import com.todoroo.astrid.voice.VoiceOutputService;
 
 import org.tasks.R;
 
-import java.util.Date;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
+import static org.tasks.date.DateTimeUtils.newDate;
+
 public class Notifications extends BroadcastReceiver {
 
     // --- constants

astrid/src/main/java/com/todoroo/astrid/reminders/ReminderDialog.java

@@ -27,6 +27,8 @@ import org.tasks.R;
 
 import java.util.Date;
 
+import static org.tasks.date.DateTimeUtils.newDate;
+
 /**
  * A dialog that shows your task reminder
  *

astrid/src/main/java/com/todoroo/astrid/reminders/ReminderService.java

@@ -33,6 +33,8 @@ import org.tasks.R;
 import java.util.Date;
 import java.util.Random;
 
+import static org.tasks.date.DateTimeUtils.newDate;
+
 
 /**
  * Data service for reminders

astrid/src/main/java/com/todoroo/astrid/reminders/WhenReminder.java

@@ -6,7 +6,7 @@ import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.astrid.api.TaskContextActionExposer;
 import com.todoroo.astrid.data.Task;
 
-import java.util.Date;
+import static org.tasks.date.DateTimeUtils.newDate;
 
 public class WhenReminder implements TaskContextActionExposer {
 

astrid/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java

@@ -48,6 +48,8 @@ import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
 
+import static org.tasks.date.DateTimeUtils.newDate;
+
 /**
  * Control Set for managing repeats
  *

astrid/src/main/java/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java

@@ -36,6 +36,9 @@ import java.util.Date;
 import java.util.List;
 import java.util.TimeZone;
 
+import static org.tasks.date.DateTimeUtils.newDate;
+import static org.tasks.date.DateTimeUtils.newDateUtc;
+
 public class RepeatTaskCompleteListener extends BroadcastReceiver {
 
     @Override
@@ -178,8 +181,7 @@ public class RepeatTaskCompleteListener extends BroadcastReceiver {
 
     };
 
-    private static WeekdayNum findNextWeekday(List<WeekdayNum> byDay,
+    private static WeekdayNum findNextWeekday(List<WeekdayNum> byDay, Calendar date) {
-            Calendar date) {
         WeekdayNum next = byDay.get(0);
         for (WeekdayNum weekday : byDay) {
             if (weekday.wday.javaDayNum > date.get(Calendar.DAY_OF_WEEK)) {
@@ -220,9 +222,9 @@ public class RepeatTaskCompleteListener extends BroadcastReceiver {
         long newDueDate;
         if(nextDate instanceof DateTimeValueImpl) {
             DateTimeValueImpl newDateTime = (DateTimeValueImpl)nextDate;
-            Date date = new Date(Date.UTC(newDateTime.year() - 1900, newDateTime.month() - 1,
+            Date date = newDateUtc(newDateTime.year(), newDateTime.month(),
                     newDateTime.day(), newDateTime.hour(),
-                    newDateTime.minute(), newDateTime.second()));
+                    newDateTime.minute(), newDateTime.second());
             // time may be inaccurate due to DST, force time to be same
             date.setHours(original.getHours());
             date.setMinutes(original.getMinutes());
@@ -230,8 +232,7 @@ public class RepeatTaskCompleteListener extends BroadcastReceiver {
                     date.getTime());
         } else {
             newDueDate = Task.createDueDate(Task.URGENCY_SPECIFIC_DAY,
-                    new Date(nextDate.year() - 1900, nextDate.month() - 1,
+                    newDate(nextDate.year(), nextDate.month(), nextDate.day()).getTime());
-                            nextDate.day()).getTime());
         }
         return newDueDate;
     }

astrid/src/main/java/com/todoroo/astrid/ui/CalendarView.java

@@ -32,6 +32,8 @@ import org.tasks.R;
 import java.util.Calendar;
 import java.util.Date;
 
+import static org.tasks.date.DateTimeUtils.newDate;
+
 public class CalendarView extends View {
 
 	private static final int PADDING = 0;

astrid/src/main/java/com/todoroo/astrid/ui/DateAndTimePicker.java

@@ -28,6 +28,8 @@ import org.tasks.R;
 import java.util.ArrayList;
 import java.util.Date;
 
+import static org.tasks.date.DateTimeUtils.newDate;
+
 public class DateAndTimePicker extends LinearLayout {
 
     private static final int SHORTCUT_PADDING = 8;

astrid/src/main/java/com/todoroo/astrid/ui/DateChangedAlerts.java

@@ -37,7 +37,8 @@ import com.todoroo.astrid.utility.Flags;
 import org.tasks.R;
 
 import java.text.ParseException;
-import java.util.Date;
+
+import static org.tasks.date.DateTimeUtils.newDate;
 
 /**
  * Helper class that creates a dialog to confirm the results of a quick add markup

astrid/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java

@@ -25,6 +25,8 @@ import org.tasks.R;
 
 import java.util.Date;
 
+import static org.tasks.date.DateTimeUtils.newDate;
+
 /**
  * Control set for specifying when a task should be hidden
  *

astrid/src/test/java/com/todoroo/andlib/test/TranslationTests.java

@@ -21,6 +21,7 @@ import java.util.Locale;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.tasks.date.DateTimeUtils.newDate;
 
 /**
  * Tests translations for consistency with the default values. You must

astrid/src/test/java/com/todoroo/andlib/utility/DateUtilitiesTest.java

@@ -23,6 +23,7 @@ import static com.todoroo.andlib.utility.DateUtilities.oneMonthFromNow;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 import static org.tasks.Freeze.freezeAt;
+import static org.tasks.date.DateTimeUtils.newDate;
 
 @RunWith(RobolectricTestRunner.class)
 public class DateUtilitiesTest extends TodorooRobolectricTestCase {

astrid/src/test/java/com/todoroo/astrid/repeats/AdvancedRepeatTest.java

@@ -24,6 +24,7 @@ import java.util.Calendar;
 import java.util.Date;
 
 import static org.junit.Assert.assertEquals;
+import static org.tasks.date.DateTimeUtils.newDate;
 
 @RunWith(RobolectricTestRunner.class)
 public class AdvancedRepeatTest extends TodorooRobolectricTestCase {
@@ -53,7 +54,7 @@ public class AdvancedRepeatTest extends TodorooRobolectricTestCase {
         buildRRule(1, Frequency.DAILY);
 
         // test specific day & time
-        long dayWithTime = Task.createDueDate(Task.URGENCY_SPECIFIC_DAY_TIME, new Date(110, 7, 1, 10, 4).getTime());
+        long dayWithTime = Task.createDueDate(Task.URGENCY_SPECIFIC_DAY_TIME, newDate(2010, 8, 1, 10, 4, 0).getTime());
         task.setValue(Task.DUE_DATE, dayWithTime);
 
         long nextDayWithTime = dayWithTime + DateUtilities.ONE_DAY;
@@ -66,7 +67,7 @@ public class AdvancedRepeatTest extends TodorooRobolectricTestCase {
         buildRRule(1, Frequency.DAILY);
 
         // test specific day & time
-        long dayWithTime = Task.createDueDate(Task.URGENCY_SPECIFIC_DAY_TIME, new Date(110, 7, 1, 10, 4, 0).getTime());
+        long dayWithTime = Task.createDueDate(Task.URGENCY_SPECIFIC_DAY_TIME, newDate(2010, 8, 1, 10, 4, 0).getTime());
         task.setValue(Task.DUE_DATE, dayWithTime);
 
         Date todayWithTime = newDate();

astrid/src/test/java/com/todoroo/astrid/repeats/RepeatAfterCompleteTest.java

@@ -20,12 +20,12 @@ import org.robolectric.RobolectricTestRunner;
 
 import java.text.ParseException;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.TimeZone;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.tasks.date.DateTimeUtils.newDate;
 
 @RunWith(RobolectricTestRunner.class)
 public class RepeatAfterCompleteTest extends TodorooRobolectricTestCase {

astrid/src/test/java/com/todoroo/astrid/repeats/RepeatTaskCompleteListenerTest.java

@@ -11,36 +11,37 @@ import java.util.Date;
 
 import static com.todoroo.astrid.repeats.RepeatTaskCompleteListener.handleSubdayRepeat;
 import static org.junit.Assert.assertEquals;
+import static org.tasks.date.DateTimeUtils.newDate;
 
 @RunWith(RobolectricTestRunner.class)
 public class RepeatTaskCompleteListenerTest {
-    private static final Date start = new Date(113, 11, 31, 8, 31, 59);
+    private static final Date start = newDate(2013, 12, 31, 8, 31, 59);
 
     @Test
     public void repeatEveryMinute() {
         assertEquals(
-                new Date(113, 11, 31, 8, 32, 1).getTime(), // astrid always sets seconds to one
+                newDate(2013, 12, 31, 8, 32, 1).getTime(), // astrid always sets seconds to one
                 handleSubdayRepeat(start, newRule(1, Frequency.MINUTELY)));
     }
 
     @Test
     public void repeatEveryOtherMinute() {
         assertEquals(
-                new Date(113, 11, 31, 8, 33, 1).getTime(),
+                newDate(2013, 12, 31, 8, 33, 1).getTime(),
                 handleSubdayRepeat(start, newRule(2, Frequency.MINUTELY)));
     }
 
     @Test
     public void repeatEveryHour() {
         assertEquals(
-                new Date(113, 11, 31, 9, 31, 1).getTime(),
+                newDate(2013, 12, 31, 9, 31, 1).getTime(),
                 handleSubdayRepeat(start, newRule(1, Frequency.HOURLY)));
     }
 
     @Test
     public void repeatEveryOtherHour() {
         assertEquals(
-                new Date(113, 11, 31, 10, 31, 1).getTime(),
+                newDate(2013, 12, 31, 10, 31, 1).getTime(),
                 handleSubdayRepeat(start, newRule(2, Frequency.HOURLY)));
     }