From 6f1057f825e3b267d69d9c340425c4035ead0af2 Mon Sep 17 00:00:00 2001 From: "Alinson S. Xavier" Date: Mon, 6 Apr 2026 12:37:47 -0500 Subject: [PATCH] Move timestamp computation from Reminder to ReminderScheduler --- .../java/org/isoron/uhabits/core/models/Reminder.kt | 7 +------ .../org/isoron/uhabits/core/reminders/ReminderScheduler.kt | 5 ++++- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Reminder.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Reminder.kt index 62bfb068..e57a7cb3 100644 --- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Reminder.kt +++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Reminder.kt @@ -18,13 +18,8 @@ */ package org.isoron.uhabits.core.models -import org.isoron.uhabits.core.utils.DateUtils - data class Reminder( val hour: Int, val minute: Int, val days: WeekdayList -) { - val timeInMillis: Long - get() = DateUtils.getUpcomingTimeInMillis(hour, minute) -} +) diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/reminders/ReminderScheduler.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/reminders/ReminderScheduler.kt index 7b101e29..de7d89f8 100644 --- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/reminders/ReminderScheduler.kt +++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/reminders/ReminderScheduler.kt @@ -55,7 +55,10 @@ class ReminderScheduler( sys.log("ReminderScheduler", "habit=" + habit.id + " has no reminder. Skipping.") return } - var reminderTime = habit.reminder!!.timeInMillis + var reminderTime = DateUtils.getUpcomingTimeInMillis( + habit.reminder!!.hour, + habit.reminder!!.minute + ) val snoozeReminderTime = widgetPreferences.getSnoozeTime(habit.id!!) if (snoozeReminderTime != 0L) { val now = DateUtils.applyTimezone(DateUtils.getLocalTime())