From 58edc6b4d8e36e32033379afcbf123fc58371b99 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Tue, 24 Oct 2023 12:28:13 -0500 Subject: [PATCH] Fix basic hourly and weekly recurrence --- .../main/java/com/todoroo/astrid/repeats/RepeatTaskHelper.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/todoroo/astrid/repeats/RepeatTaskHelper.kt b/app/src/main/java/com/todoroo/astrid/repeats/RepeatTaskHelper.kt index ec063ac13..705d1a4ca 100644 --- a/app/src/main/java/com/todoroo/astrid/repeats/RepeatTaskHelper.kt +++ b/app/src/main/java/com/todoroo/astrid/repeats/RepeatTaskHelper.kt @@ -154,7 +154,7 @@ class RepeatTaskHelper @Inject constructor( recur: Recur, original: DateTime, hasDueTime: Boolean): Long { val byDay = recur.dayList var newDate = original.millis - newDate += DateUtilities.ONE_WEEK * (recur.interval - 1) + newDate += DateUtilities.ONE_WEEK * (recur.interval.coerceAtLeast(1) - 1) var date = DateTime(newDate) Collections.sort(byDay, weekdayCompare) val next = findNextWeekday(byDay, date) @@ -263,7 +263,7 @@ class RepeatTaskHelper @Inject constructor( else -> throw RuntimeException( "Error handing subday repeat: " + recur.frequency) // $NON-NLS-1$ } - val newDueDate = startDate.millis + millis * recur.interval + val newDueDate = startDate.millis + millis * recur.interval.coerceAtLeast(1) return createDueDate(Task.URGENCY_SPECIFIC_DAY_TIME, newDueDate) }