Handle weekly same day reminder that already passed

HabitRPG · Jan 4, 2024 · 779110c · 779110c
1 parent 5b1a6dd
commit 779110c
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt
@@ -353,6 +353,7 @@ open class Task : RealmObject, BaseMainObject, Parcelable, BaseTask {
         if (remindersItem == null) return null
 
         val reminderTime = remindersItem.time?.parseToZonedDateTime() ?: return null
+        val now = ZonedDateTime.now().withZoneSameInstant(ZoneId.systemDefault())
         var startDate = this.startDate?.toInstant()?.atZone(ZoneId.systemDefault()) ?: return null
         val frequency = this.frequency ?: return null
         val everyX = this.everyX ?: 1
@@ -380,6 +381,16 @@ open class Task : RealmObject, BaseMainObject, Parcelable, BaseTask {
                         dateTimeOccurenceToSchedule = startDate
                     } else {
                         var nextDueDate = dateTimeOccurenceToSchedule.withHour(reminderTime.hour).withMinute(reminderTime.minute)
+                        // If the next due date already happened for today, increment it by one day. Otherwise, it will be scheduled for today.
+                        if (nextDueDate.isBefore(now) && occurrencesList.size == 0) {
+                            nextDueDate = nextDueDate.plusDays(1)
+                        }
+
+                        // If the reminder being scheduled is not the first iteration of the reminder, increment it by one day
+                        if (occurrencesList.size > 0) {
+                            nextDueDate = nextDueDate.plusDays(1)
+                        }
+
                         while (!nextDueDate.matchesRepeatDays(repeatDays)) {
                             nextDueDate = nextDueDate.plusDays(1).withHour(reminderTime.hour).withMinute(reminderTime.minute)
                         }
@@ -394,16 +405,6 @@ open class Task : RealmObject, BaseMainObject, Parcelable, BaseTask {
                             }
                         }
 
-                        // Ensure the next due date is in the future
-                        val now = ZonedDateTime.now().withZoneSameInstant(ZoneId.systemDefault())
-                        if (nextDueDate.isBefore(now)) {
-                            nextDueDate = nextDueDate.plusWeeks(everyX.toLong())
-                            // Find the next due day in the future
-                            while (!nextDueDate.matchesRepeatDays(repeatDays)) {
-                                nextDueDate = nextDueDate.plusDays(1).withHour(reminderTime.hour).withMinute(reminderTime.minute)
-                            }
-                        }
-
                         dateTimeOccurenceToSchedule = nextDueDate
                     }
                     // Set time to the reminder time