|
|
@ -19,6 +19,7 @@ public class DueDateTimeMigrator {
|
|
|
|
@Autowired TaskDao taskDao;
|
|
|
|
@Autowired TaskDao taskDao;
|
|
|
|
|
|
|
|
|
|
|
|
private static final String PREF_MIGRATED_DUE_TIMES = "migrated_due_times"; //$NON-NLS-1$
|
|
|
|
private static final String PREF_MIGRATED_DUE_TIMES = "migrated_due_times"; //$NON-NLS-1$
|
|
|
|
|
|
|
|
private static final String STRFTIME_FORMAT = "%H:%M%S"; //$NON-NLS-1$
|
|
|
|
private static final String LEGACY_NO_TIME_STRING = "23:59:59"; //$NON-NLS-1$
|
|
|
|
private static final String LEGACY_NO_TIME_STRING = "23:59:59"; //$NON-NLS-1$
|
|
|
|
|
|
|
|
|
|
|
|
public DueDateTimeMigrator() {
|
|
|
|
public DueDateTimeMigrator() {
|
|
|
@ -34,13 +35,14 @@ public class DueDateTimeMigrator {
|
|
|
|
// Get tasks with due time (i.e. due date != 23:59:59)
|
|
|
|
// Get tasks with due time (i.e. due date != 23:59:59)
|
|
|
|
TodorooCursor<Task> tasksWithDueTime = taskDao.query(Query.select(Task.ID, Task.TITLE, Task.DUE_DATE).where(
|
|
|
|
TodorooCursor<Task> tasksWithDueTime = taskDao.query(Query.select(Task.ID, Task.TITLE, Task.DUE_DATE).where(
|
|
|
|
Criterion.and(Task.DUE_DATE.gt(0),
|
|
|
|
Criterion.and(Task.DUE_DATE.gt(0),
|
|
|
|
Criterion.not(Functions.strftime(Task.DUE_DATE).eq(LEGACY_NO_TIME_STRING)))));
|
|
|
|
Criterion.not(Functions.strftime(Task.DUE_DATE, STRFTIME_FORMAT).eq(LEGACY_NO_TIME_STRING)))));
|
|
|
|
|
|
|
|
|
|
|
|
// Get tasks with no due time (i.e. due date = 23:59:59)
|
|
|
|
// Get tasks with no due time (i.e. due date = 23:59:59)
|
|
|
|
TodorooCursor<Task> tasksWithoutDueTime = taskDao.query(Query.select(Task.ID, Task.TITLE, Task.DUE_DATE).where(
|
|
|
|
TodorooCursor<Task> tasksWithoutDueTime = taskDao.query(Query.select(Task.ID, Task.TITLE, Task.DUE_DATE).where(
|
|
|
|
Criterion.and(Task.DUE_DATE.gt(0),
|
|
|
|
Criterion.and(Task.DUE_DATE.gt(0),
|
|
|
|
Functions.strftime(Task.DUE_DATE).eq(LEGACY_NO_TIME_STRING))));
|
|
|
|
Functions.strftime(Task.DUE_DATE, STRFTIME_FORMAT).eq(LEGACY_NO_TIME_STRING))));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
try {
|
|
|
|
// Set tasks with time to have time HH:MM:01
|
|
|
|
// Set tasks with time to have time HH:MM:01
|
|
|
|
processCursor(tasksWithDueTime, new TaskDateAdjuster() {
|
|
|
|
processCursor(tasksWithDueTime, new TaskDateAdjuster() {
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
@ -58,13 +60,16 @@ public class DueDateTimeMigrator {
|
|
|
|
date.setSeconds(0);
|
|
|
|
date.setSeconds(0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
} finally {
|
|
|
|
|
|
|
|
tasksWithDueTime.close();
|
|
|
|
|
|
|
|
tasksWithoutDueTime.close();
|
|
|
|
|
|
|
|
}
|
|
|
|
Preferences.setBoolean(PREF_MIGRATED_DUE_TIMES, true);
|
|
|
|
Preferences.setBoolean(PREF_MIGRATED_DUE_TIMES, true);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private void processCursor(TodorooCursor<Task> cursor, TaskDateAdjuster adjuster) {
|
|
|
|
private void processCursor(TodorooCursor<Task> cursor, TaskDateAdjuster adjuster) {
|
|
|
|
Task curr = new Task();
|
|
|
|
Task curr = new Task();
|
|
|
|
try {
|
|
|
|
|
|
|
|
for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
|
|
|
|
for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
|
|
|
|
curr.readFromCursor(cursor);
|
|
|
|
curr.readFromCursor(cursor);
|
|
|
|
long time = curr.getValue(Task.DUE_DATE) / 1000L * 1000L;
|
|
|
|
long time = curr.getValue(Task.DUE_DATE) / 1000L * 1000L;
|
|
|
@ -73,9 +78,6 @@ public class DueDateTimeMigrator {
|
|
|
|
curr.setValue(Task.DUE_DATE, date.getTime());
|
|
|
|
curr.setValue(Task.DUE_DATE, date.getTime());
|
|
|
|
taskDao.save(curr);
|
|
|
|
taskDao.save(curr);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} finally {
|
|
|
|
|
|
|
|
cursor.close();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|