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

Remove AlarmEntry

Browse Source
pull/2906/head
Alex Baker 4 months ago
parent a49c233584
commit 9ee739627e
5 changed files with 58 additions and 118 deletions
Show Stats Download Patch File Download Diff File

10
app/src/main/java/com/todoroo/astrid/alarms/AlarmCalculator.kt
Unescape Escape View File

@ -1,8 +1,8 @@
package com.todoroo.astrid.alarms package com.todoroo.astrid.alarms
import org.tasks.data.entity.Task
import org.tasks.data.entity.Alarm import org.tasks.data.entity.Alarm
import org.tasks.jobs.AlarmEntry import org.tasks.data.entity.Notification
import org.tasks.data.entity.Task
import org.tasks.preferences.Preferences import org.tasks.preferences.Preferences
import org.tasks.reminders.Random import org.tasks.reminders.Random
import org.tasks.time.DateTimeUtils.withMillisOfDay import org.tasks.time.DateTimeUtils.withMillisOfDay
@ -18,7 +18,7 @@ class AlarmCalculator(
preferences: Preferences preferences: Preferences
) : this(preferences.isDefaultDueTimeEnabled, Random(), preferences.defaultDueTime) ) : this(preferences.isDefaultDueTimeEnabled, Random(), preferences.defaultDueTime)
fun toAlarmEntry(task: Task, alarm: Alarm): AlarmEntry? { fun toAlarmEntry(task: Task, alarm: Alarm): Notification? {
val trigger = when (alarm.type) { val trigger = when (alarm.type) {
Alarm.TYPE_SNOOZE, Alarm.TYPE_SNOOZE,
Alarm.TYPE_DATE_TIME -> Alarm.TYPE_DATE_TIME ->
@ -50,12 +50,12 @@ class AlarmCalculator(
trigger <= AlarmService.NO_ALARM -> trigger <= AlarmService.NO_ALARM ->
null null
trigger > task.reminderLast || alarm.type == Alarm.TYPE_SNOOZE -> trigger > task.reminderLast || alarm.type == Alarm.TYPE_SNOOZE ->
AlarmEntry(alarm.id, alarm.task, trigger, alarm.type) Notification(taskId = alarm.task, timestamp = trigger, type = alarm.type)
alarm.repeat > 0 -> { alarm.repeat > 0 -> {
val past = (task.reminderLast - trigger) / alarm.interval val past = (task.reminderLast - trigger) / alarm.interval
val next = trigger + (past + 1) * alarm.interval val next = trigger + (past + 1) * alarm.interval
if (past < alarm.repeat && next > task.reminderLast) { if (past < alarm.repeat && next > task.reminderLast) {
AlarmEntry(alarm.id, alarm.task, next, alarm.type) Notification(taskId = alarm.task, timestamp = next, type = alarm.type)
} else { } else {
null null
} }

19
app/src/main/java/com/todoroo/astrid/alarms/AlarmService.kt
Unescape Escape View File

@ -12,7 +12,6 @@ import org.tasks.data.db.DbUtils
import org.tasks.data.entity.Alarm import org.tasks.data.entity.Alarm
import org.tasks.data.entity.Alarm.Companion.TYPE_SNOOZE import org.tasks.data.entity.Alarm.Companion.TYPE_SNOOZE
import org.tasks.data.entity.Notification import org.tasks.data.entity.Notification
import org.tasks.jobs.AlarmEntry
import org.tasks.jobs.WorkManager import org.tasks.jobs.WorkManager
import org.tasks.notifications.NotificationManager import org.tasks.notifications.NotificationManager
import org.tasks.preferences.Preferences import org.tasks.preferences.Preferences
@ -76,28 +75,28 @@ class AlarmService @Inject constructor(
} }
val (overdue, _) = getAlarms() val (overdue, _) = getAlarms()
overdue overdue
.sortedBy { it.time } .sortedBy { it.timestamp }
.also { alarms -> .also { alarms ->
alarms alarms
.map { it.taskId } .map { it.taskId }
.chunked(DbUtils.MAX_SQLITE_ARGS) .chunked(DbUtils.MAX_SQLITE_ARGS)
.onEach { alarmDao.deleteSnoozed(it) } .onEach { alarmDao.deleteSnoozed(it) }
} }
.map { it.toNotification() } .map { it.copy(timestamp = currentTimeMillis()) }
.let { trigger(it) } .let { trigger(it) }
val alreadyTriggered = overdue.map { it.taskId }.toSet() val alreadyTriggered = overdue.map { it.taskId }.toSet()
val (moreOverdue, future) = getAlarms() val (moreOverdue, future) = getAlarms()
return moreOverdue return moreOverdue
.filterNot { it.type == Alarm.TYPE_RANDOM || alreadyTriggered.contains(it.taskId) } .filterNot { it.type == Alarm.TYPE_RANDOM || alreadyTriggered.contains(it.taskId) }
.plus(future) .plus(future)
.minOfOrNull { it.time } .minOfOrNull { it.timestamp }
?: 0 ?: 0
} }
internal suspend fun getAlarms(): Pair<List<AlarmEntry>, List<AlarmEntry>> { internal suspend fun getAlarms(): Pair<List<Notification>, List<Notification>> {
val start = currentTimeMillis() val start = currentTimeMillis()
val overdue = ArrayList<AlarmEntry>() val overdue = ArrayList<Notification>()
val future = ArrayList<AlarmEntry>() val future = ArrayList<Notification>()
alarmDao.getActiveAlarms() alarmDao.getActiveAlarms()
.groupBy { it.task } .groupBy { it.task }
.forEach { (taskId, alarms) -> .forEach { (taskId, alarms) ->
@ -105,14 +104,14 @@ class AlarmService @Inject constructor(
val alarmEntries = alarms.mapNotNull { val alarmEntries = alarms.mapNotNull {
alarmCalculator.toAlarmEntry(task, it) alarmCalculator.toAlarmEntry(task, it)
} }
val (now, later) = alarmEntries.partition { it.time <= DateTime().startOfMinute().plusMinutes(1).millis } val (now, later) = alarmEntries.partition { it.timestamp <= DateTime().startOfMinute().plusMinutes(1).millis }
later later
.filter { it.type == TYPE_SNOOZE } .filter { it.type == TYPE_SNOOZE }
.maxByOrNull { it.time } .maxByOrNull { it.timestamp }
?.let { future.add(it) } ?.let { future.add(it) }
?: run { ?: run {
now.firstOrNull()?.let { overdue.add(it) } now.firstOrNull()?.let { overdue.add(it) }
later.minByOrNull { it.time }?.let { future.add(it) } later.minByOrNull { it.timestamp }?.let { future.add(it) }
} }
} }
Timber.d("took ${currentTimeMillis() - start}ms overdue=${overdue.size} future=${future.size}") Timber.d("took ${currentTimeMillis() - start}ms overdue=${overdue.size} future=${future.size}")

22
app/src/main/java/org/tasks/jobs/AlarmEntry.kt
Unescape Escape View File

@ -1,22 +0,0 @@
package org.tasks.jobs
import org.tasks.data.entity.Notification
import org.tasks.time.DateTimeUtils2.currentTimeMillis
import org.tasks.time.printTimestamp
data class AlarmEntry(
val id: Long,
val taskId: Long,
val time: Long,
val type: Int
) {
fun toNotification(): Notification = Notification(
taskId = taskId,
type = type,
timestamp = currentTimeMillis(),
)
override fun toString(): String {
return "AlarmEntry(id=$id, taskId=$taskId, time=${printTimestamp(time)}, type=$type)"
}
}

93
app/src/test/java/com/todoroo/astrid/alarms/AlarmCalculatorTest.kt
Unescape Escape View File

@ -18,14 +18,12 @@ import org.tasks.data.entity.Alarm.Companion.TYPE_SNOOZE
import org.tasks.data.entity.Alarm.Companion.whenDue import org.tasks.data.entity.Alarm.Companion.whenDue
import org.tasks.data.entity.Alarm.Companion.whenOverdue import org.tasks.data.entity.Alarm.Companion.whenOverdue
import org.tasks.data.entity.Alarm.Companion.whenStarted import org.tasks.data.entity.Alarm.Companion.whenStarted
import org.tasks.data.entity.Notification
import org.tasks.data.entity.Task.Companion.HIDE_UNTIL_DUE import org.tasks.data.entity.Task.Companion.HIDE_UNTIL_DUE
import org.tasks.data.entity.Task.Companion.HIDE_UNTIL_DUE_TIME import org.tasks.data.entity.Task.Companion.HIDE_UNTIL_DUE_TIME
import org.tasks.data.entity.Task.Companion.URGENCY_SPECIFIC_DAY_TIME import org.tasks.data.entity.Task.Companion.URGENCY_SPECIFIC_DAY_TIME
import org.tasks.date.DateTimeUtils.newDateTime import org.tasks.date.DateTimeUtils.newDateTime
import org.tasks.date.DateTimeUtils.toDateTime import org.tasks.date.DateTimeUtils.toDateTime
import org.tasks.makers.AlarmEntryMaker.TIME
import org.tasks.makers.AlarmEntryMaker.TYPE
import org.tasks.makers.AlarmEntryMaker.newAlarmEntry
import org.tasks.makers.TaskMaker.CREATION_TIME import org.tasks.makers.TaskMaker.CREATION_TIME
import org.tasks.makers.TaskMaker.DUE_DATE import org.tasks.makers.TaskMaker.DUE_DATE
import org.tasks.makers.TaskMaker.DUE_TIME import org.tasks.makers.TaskMaker.DUE_TIME
@ -70,7 +68,7 @@ class AlarmCalculatorTest {
Alarm(time = now.millis + 1, type = TYPE_DATE_TIME) Alarm(time = now.millis + 1, type = TYPE_DATE_TIME)
) )
assertEquals(newAlarmEntry(with(TIME, now.plusMillis(1)), with(TYPE, TYPE_DATE_TIME)), alarm) assertEquals(Notification(timestamp = now.millis + 1, type = TYPE_DATE_TIME), alarm)
} }
@Test @Test
@ -80,10 +78,7 @@ class AlarmCalculatorTest {
Alarm(time = now.millis, type = TYPE_SNOOZE) Alarm(time = now.millis, type = TYPE_SNOOZE)
) )
assertEquals( assertEquals(Notification(timestamp = now.millis, type = TYPE_SNOOZE), alarm)
newAlarmEntry(with(TIME, now), with(TYPE, TYPE_SNOOZE)),
alarm
)
} }
@Test @Test
@ -91,9 +86,9 @@ class AlarmCalculatorTest {
val alarm = alarmCalculator.toAlarmEntry(newTask(with(DUE_DATE, now)), whenDue(0L)) val alarm = alarmCalculator.toAlarmEntry(newTask(with(DUE_DATE, now)), whenDue(0L))
assertEquals( assertEquals(
newAlarmEntry( Notification(
with(TIME, now.startOfDay().withHourOfDay(13)), timestamp = now.startOfDay().withHourOfDay(13).millis,
with(TYPE, TYPE_REL_END) type = TYPE_REL_END
), ),
alarm alarm
) )
@ -104,8 +99,9 @@ class AlarmCalculatorTest {
val alarm = alarmCalculator.toAlarmEntry(newTask(with(DUE_TIME, now)), whenDue(0L)) val alarm = alarmCalculator.toAlarmEntry(newTask(with(DUE_TIME, now)), whenDue(0L))
assertEquals( assertEquals(
newAlarmEntry( Notification(
with(TIME, now.startOfMinute().plusMillis(1000)), with(TYPE, TYPE_REL_END) timestamp = now.startOfMinute().plusMillis(1000).millis,
type = TYPE_REL_END
), ),
alarm alarm
) )
@ -119,9 +115,9 @@ class AlarmCalculatorTest {
) )
assertEquals( assertEquals(
newAlarmEntry( Notification(
with(TIME, now.startOfDay().withHourOfDay(13)), timestamp = now.startOfDay().withHourOfDay(13).millis,
with(TYPE, TYPE_REL_START) type = TYPE_REL_START
), ),
alarm alarm
) )
@ -135,9 +131,9 @@ class AlarmCalculatorTest {
) )
assertEquals( assertEquals(
newAlarmEntry( Notification(
with(TIME, now.startOfMinute().plusMillis(1000)), timestamp = now.startOfMinute().plusMillis(1000).millis,
with(TYPE, TYPE_REL_START) type = TYPE_REL_START
), ),
alarm alarm
) )
@ -152,9 +148,9 @@ class AlarmCalculatorTest {
) )
assertEquals( assertEquals(
newAlarmEntry( Notification(
with(TIME, DateTime(2023, 11, 4, 13, 0, 0)), timestamp = DateTime(2023, 11, 4, 13, 0, 0).millis,
with(TYPE, TYPE_REL_END) type = TYPE_REL_END
), ),
alarm alarm
) )
@ -169,9 +165,9 @@ class AlarmCalculatorTest {
) )
assertEquals( assertEquals(
newAlarmEntry( Notification(
with(TIME, now.plusDays(1).startOfMinute().plusMillis(1000)), timestamp = now.plusDays(1).startOfMinute().plusMillis(1000).millis,
with(TYPE, TYPE_REL_END) type = TYPE_REL_END
), ),
alarm alarm
) )
@ -186,9 +182,9 @@ class AlarmCalculatorTest {
) )
assertEquals( assertEquals(
newAlarmEntry( Notification(
with(TIME, DateTime(2023, 11, 4, 13, 0)), timestamp = DateTime(2023, 11, 4, 13, 0).millis,
with(TYPE, TYPE_REL_START) type = TYPE_REL_START
), ),
alarm alarm
) )
@ -203,9 +199,9 @@ class AlarmCalculatorTest {
) )
assertEquals( assertEquals(
newAlarmEntry( Notification(
with(TIME, now.plusDays(1).startOfMinute().plusMillis(1000)), timestamp = now.plusDays(1).startOfMinute().plusMillis(1000).millis,
with(TYPE, TYPE_REL_START) type = TYPE_REL_START
), ),
alarm alarm
) )
@ -219,9 +215,9 @@ class AlarmCalculatorTest {
) )
assertEquals( assertEquals(
newAlarmEntry( Notification(
with(TIME, now.plusMinutes(5).startOfMinute().plusMillis(1000)), timestamp = now.plusMinutes(5).startOfMinute().plusMillis(1000).millis,
with(TYPE, TYPE_REL_END) type = TYPE_REL_END
), ),
alarm alarm
) )
@ -235,9 +231,9 @@ class AlarmCalculatorTest {
) )
assertEquals( assertEquals(
newAlarmEntry( Notification(
with(TIME, now.plusMinutes(10).startOfMinute().plusMillis(1000)), timestamp = now.plusMinutes(10).startOfMinute().plusMillis(1000).millis,
with(TYPE, TYPE_REL_END) type = TYPE_REL_END
), ),
alarm alarm
) )
@ -279,7 +275,7 @@ class AlarmCalculatorTest {
) )
assertEquals( assertEquals(
newAlarmEntry(with(TIME, dueDate.plusDays(7)), with(TYPE, TYPE_REL_END)), Notification(timestamp = dueDate.plusDays(7).millis, type = TYPE_REL_END),
alarm alarm
) )
} }
@ -310,7 +306,9 @@ class AlarmCalculatorTest {
) )
assertEquals( assertEquals(
newAlarmEntry(with(TIME, now.minusDays(14).plusMillis(584206592)), with(TYPE, TYPE_RANDOM)), Notification(
timestamp = now.minusDays(14).plusMillis(584206592).millis,
type = TYPE_RANDOM),
alarm alarm
) )
} }
@ -331,10 +329,7 @@ class AlarmCalculatorTest {
Alarm(time = ONE_WEEK, type = TYPE_RANDOM) Alarm(time = ONE_WEEK, type = TYPE_RANDOM)
) )
assertEquals( assertEquals(Notification(timestamp = task.dueDate, type = TYPE_RANDOM), alarm)
newAlarmEntry(with(TIME, task.dueDate.toDateTime()), with(TYPE, TYPE_RANDOM)),
alarm
)
} }
} }
@ -352,9 +347,9 @@ class AlarmCalculatorTest {
) )
assertEquals( assertEquals(
newAlarmEntry( Notification(
with(TIME, now.minusDays(1).plusMillis(584206592)), timestamp = now.minusDays(1).plusMillis(584206592).millis,
with(TYPE, TYPE_RANDOM) type = TYPE_RANDOM
), ),
alarm alarm
) )
@ -375,9 +370,9 @@ class AlarmCalculatorTest {
) )
assertEquals( assertEquals(
newAlarmEntry( Notification(
with(TIME, now.minusDays(1).plusMillis(584206592)), timestamp = now.minusDays(1).plusMillis(584206592).millis,
with(TYPE, TYPE_RANDOM) type = TYPE_RANDOM
), ),
alarm alarm
) )

32
app/src/test/java/org/tasks/makers/AlarmEntryMaker.kt
Unescape Escape View File

@ -1,32 +0,0 @@
package org.tasks.makers
import com.natpryce.makeiteasy.Instantiator
import com.natpryce.makeiteasy.Property
import com.natpryce.makeiteasy.Property.newProperty
import com.natpryce.makeiteasy.PropertyLookup
import com.natpryce.makeiteasy.PropertyValue
import org.tasks.data.entity.Alarm.Companion.TYPE_DATE_TIME
import org.tasks.date.DateTimeUtils.newDateTime
import org.tasks.jobs.AlarmEntry
import org.tasks.makers.Maker.make
import org.tasks.time.DateTime
object AlarmEntryMaker {
val ID: Property<AlarmEntry, Long> = newProperty()
val TASK: Property<AlarmEntry, Long> = newProperty()
val TIME: Property<AlarmEntry, DateTime> = newProperty()
val TYPE: Property<AlarmEntry, Int> = newProperty()
private val instantiator = Instantiator { lookup: PropertyLookup<AlarmEntry> ->
AlarmEntry(
lookup.valueOf(ID, 0L),
lookup.valueOf(TASK, 0L),
lookup.valueOf(TIME, newDateTime()).millis,
lookup.valueOf(TYPE, TYPE_DATE_TIME)
)
}
fun newAlarmEntry(vararg properties: PropertyValue<in AlarmEntry?, *>): AlarmEntry {
return make(instantiator, *properties)
}
}
Write Preview
Loading…
Cancel
Save