archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove NOTIFICATION_PROPERTIES

Browse Source
pull/618/head
Alex Baker 7 years ago
parent 723208611d
commit 5496edc6bf
3 changed files with 24 additions and 52 deletions
Show Stats Download Patch File Download Diff File

40
app/src/androidTest/java/com/todoroo/astrid/reminders/ReminderServiceTest.java
Unescape Escape View File

@ -77,14 +77,14 @@ public class ReminderServiceTest extends InjectingTestCase {
@Test
public void dontScheduleDueDateReminderWhenFlagNotSet() {
service.scheduleAlarm(null, newTask(with(ID, 1L), with(DUE_TIME, newDateTime())));
service.scheduleAlarm(newTask(with(ID, 1L), with(DUE_TIME, newDateTime())));
verify(jobs).cancelReminder(1);
}
@Test
public void dontScheduleDueDateReminderWhenTimeNotSet() {
service.scheduleAlarm(null, newTask(with(ID, 1L), with(REMINDERS, NOTIFY_AT_DEADLINE)));
service.scheduleAlarm(newTask(with(ID, 1L), with(REMINDERS, NOTIFY_AT_DEADLINE)));
verify(jobs).cancelReminder(1);
}
@ -95,7 +95,7 @@ public class ReminderServiceTest extends InjectingTestCase {
with(ID, 1L),
with(DUE_TIME, newDateTime().minusDays(1)),
with(REMINDERS, NOTIFY_AT_DEADLINE));
service.scheduleAlarm(null, task);
service.scheduleAlarm(task);
InOrder order = inOrder(jobs);
order.verify(jobs).cancelReminder(1);
@ -108,7 +108,7 @@ public class ReminderServiceTest extends InjectingTestCase {
with(ID, 1L),
with(DUE_TIME, newDateTime().plusDays(1)),
with(REMINDERS, NOTIFY_AT_DEADLINE));
service.scheduleAlarm(null, task);
service.scheduleAlarm(task);
InOrder order = inOrder(jobs);
order.verify(jobs).cancelReminder(1);
@ -123,7 +123,7 @@ public class ReminderServiceTest extends InjectingTestCase {
with(DUE_DATE, now),
with(REMINDERS, NOTIFY_AT_DEADLINE));
service.scheduleAlarm(null, task);
service.scheduleAlarm(task);
InOrder order = inOrder(jobs);
order.verify(jobs).cancelReminder(1);
@ -138,7 +138,7 @@ public class ReminderServiceTest extends InjectingTestCase {
with(COMPLETION_TIME, newDateTime()),
with(REMINDERS, NOTIFY_AT_DEADLINE));
service.scheduleAlarm(null, task);
service.scheduleAlarm(task);
verify(jobs).cancelReminder(1);
}
@ -151,7 +151,7 @@ public class ReminderServiceTest extends InjectingTestCase {
with(DELETION_TIME, newDateTime()),
with(REMINDERS, NOTIFY_AT_DEADLINE));
service.scheduleAlarm(null, task);
service.scheduleAlarm(task);
verify(jobs).cancelReminder(1);
}
@ -165,7 +165,7 @@ public class ReminderServiceTest extends InjectingTestCase {
with(REMINDER_LAST, now.plusSeconds(1)),
with(REMINDERS, NOTIFY_AT_DEADLINE));
service.scheduleAlarm(null, task);
service.scheduleAlarm(task);
verify(jobs).cancelReminder(1);
}
@ -178,7 +178,7 @@ public class ReminderServiceTest extends InjectingTestCase {
with(SNOOZE_TIME, newDateTime().minusMinutes(5)),
with(REMINDER_LAST, newDateTime().minusMinutes(4)),
with(REMINDERS, NOTIFY_AT_DEADLINE));
service.scheduleAlarm(null, task);
service.scheduleAlarm(task);
InOrder order = inOrder(jobs);
order.verify(jobs).cancelReminder(1);
@ -194,7 +194,7 @@ public class ReminderServiceTest extends InjectingTestCase {
with(SNOOZE_TIME, dueDate.minusMinutes(4)),
with(REMINDER_LAST, dueDate.minusMinutes(5)),
with(REMINDERS, NOTIFY_AT_DEADLINE));
service.scheduleAlarm(null, task);
service.scheduleAlarm(task);
InOrder order = inOrder(jobs);
order.verify(jobs).cancelReminder(1);
@ -212,7 +212,7 @@ public class ReminderServiceTest extends InjectingTestCase {
with(CREATION_TIME, now.minusDays(1)),
with(RANDOM_REMINDER_PERIOD, ONE_WEEK));
service.scheduleAlarm(null, task);
service.scheduleAlarm(task);
InOrder order = inOrder(jobs);
order.verify(jobs).cancelReminder(1);
@ -231,7 +231,7 @@ public class ReminderServiceTest extends InjectingTestCase {
with(CREATION_TIME, now.minusDays(30)),
with(RANDOM_REMINDER_PERIOD, ONE_WEEK));
service.scheduleAlarm(null, task);
service.scheduleAlarm(task);
InOrder order = inOrder(jobs);
order.verify(jobs).cancelReminder(1);
@ -250,7 +250,7 @@ public class ReminderServiceTest extends InjectingTestCase {
with(CREATION_TIME, now.minusDays(30)),
with(RANDOM_REMINDER_PERIOD, ONE_WEEK));
service.scheduleAlarm(null, task);
service.scheduleAlarm(task);
InOrder order = inOrder(jobs);
order.verify(jobs).cancelReminder(1);
@ -266,7 +266,7 @@ public class ReminderServiceTest extends InjectingTestCase {
with(REMINDER_LAST, (DateTime) null),
with(REMINDERS, NOTIFY_AFTER_DEADLINE));
service.scheduleAlarm(null, task);
service.scheduleAlarm(task);
InOrder order = inOrder(jobs);
order.verify(jobs).cancelReminder(1);
@ -281,7 +281,7 @@ public class ReminderServiceTest extends InjectingTestCase {
with(REMINDER_LAST, new DateTime(2017, 9, 24, 12, 0)),
with(REMINDERS, NOTIFY_AFTER_DEADLINE));
service.scheduleAlarm(null, task);
service.scheduleAlarm(task);
InOrder order = inOrder(jobs);
order.verify(jobs).cancelReminder(1);
@ -296,7 +296,7 @@ public class ReminderServiceTest extends InjectingTestCase {
with(REMINDER_LAST, new DateTime(2017, 9, 24, 15, 0)),
with(REMINDERS, NOTIFY_AFTER_DEADLINE));
service.scheduleAlarm(null, task);
service.scheduleAlarm(task);
InOrder order = inOrder(jobs);
order.verify(jobs).cancelReminder(1);
@ -312,7 +312,7 @@ public class ReminderServiceTest extends InjectingTestCase {
with(REMINDER_LAST, new DateTime(2017, 9, 23, 12, 17, 59, 999)),
with(REMINDERS, NOTIFY_AFTER_DEADLINE));
service.scheduleAlarm(null, task);
service.scheduleAlarm(task);
InOrder order = inOrder(jobs);
order.verify(jobs).cancelReminder(1);
@ -327,7 +327,7 @@ public class ReminderServiceTest extends InjectingTestCase {
with(REMINDER_LAST, new DateTime(2017, 9, 23, 15, 30, 59, 999)),
with(REMINDERS, NOTIFY_AFTER_DEADLINE));
service.scheduleAlarm(null, task);
service.scheduleAlarm(task);
InOrder order = inOrder(jobs);
order.verify(jobs).cancelReminder(1);
@ -342,7 +342,7 @@ public class ReminderServiceTest extends InjectingTestCase {
with(REMINDER_LAST, new DateTime(2017, 9, 23, 12, 17, 59, 999)),
with(REMINDERS, NOTIFY_AFTER_DEADLINE));
service.scheduleAlarm(null, task);
service.scheduleAlarm(task);
InOrder order = inOrder(jobs);
order.verify(jobs).cancelReminder(1);
@ -359,7 +359,7 @@ public class ReminderServiceTest extends InjectingTestCase {
with(REMINDERS, NOTIFY_AT_DEADLINE | NOTIFY_AFTER_DEADLINE),
with(RANDOM_REMINDER_PERIOD, ONE_HOUR));
service.scheduleAlarm(null, task);
service.scheduleAlarm(task);
InOrder order = inOrder(jobs);
order.verify(jobs).cancelReminder(1);

34
app/src/main/java/com/todoroo/astrid/reminders/ReminderService.java
Unescape Escape View File

@ -5,7 +5,6 @@
*/
package com.todoroo.astrid.reminders;
import com.todoroo.andlib.data.Property;
import com.todoroo.andlib.sql.Criterion;
import com.todoroo.andlib.sql.Query;
import com.todoroo.andlib.utility.DateUtilities;
@ -25,21 +24,6 @@ import javax.inject.Inject;
@ApplicationScope
public final class ReminderService {
// --- constants
private static final Property<?>[] NOTIFICATION_PROPERTIES = new Property<?>[] {
Task.ID,
Task.CREATION_DATE,
Task.COMPLETION_DATE,
Task.DELETION_DATE,
Task.DUE_DATE,
Task.REMINDER_FLAGS,
Task.REMINDER_PERIOD,
Task.REMINDER_LAST,
Task.REMINDER_SNOOZE,
Task.IMPORTANCE
};
/** flag for due date reminder */
public static final int TYPE_DUE = 0;
/** flag for overdue reminder */
@ -69,32 +53,20 @@ public final class ReminderService {
}
public void scheduleAllAlarms(TaskDao taskDao) {
Query query = Query.select(NOTIFICATION_PROPERTIES).where(Criterion.and(
Query query = Query.select(Task.PROPERTIES).where(Criterion.and(
TaskCriteria.isActive(),
Criterion.or(Task.REMINDER_FLAGS.gt(0), Task.REMINDER_PERIOD.gt(0))));
for (Task task : taskDao.toList(query)) {
scheduleAlarm(null, task);
scheduleAlarm(task);
}
}
public void scheduleAlarm(TaskDao taskDao, Task task) {
public void scheduleAlarm(Task task) {
if(task == null || !task.isSaved()) {
return;
}
// read data if necessary
long taskId = task.getId();
if(taskDao != null) {
for(Property<?> property : NOTIFICATION_PROPERTIES) {
if(!task.containsValue(property)) {
task = taskDao.fetch(taskId);
if(task == null) {
return;
}
break;
}
}
}
// Make sure no alarms are scheduled other than the next one. When that one is shown, it
// will schedule the next one after it, and so on and so forth.

2
app/src/main/java/org/tasks/jobs/AfterSaveIntentService.java
Unescape Escape View File

@ -77,7 +77,7 @@ public class AfterSaveIntentService extends InjectingJobIntentService {
modifiedValues.containsKey(Task.REMINDER_PERIOD.name) ||
modifiedValues.containsKey(Task.REMINDER_LAST.name) ||
modifiedValues.containsKey(Task.REMINDER_SNOOZE.name)) {
reminderService.scheduleAlarm(taskDao, task);
reminderService.scheduleAlarm(task);
}
if(TaskApiDao.insignificantChange(modifiedValues)) {

Write Preview
Loading…
Cancel
Save