Skip to content

Fixes HabitRPG/habitica-android#2180 #2182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
melissa-b-02 wants to merge 2 commits into
base: develop
Choose a base branch
from
+32 −22
Open

Fixes HabitRPG/habitica-android#2180 #2182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55d3306
refactor reminder time handling to use `LocalDateTime`
angi-mint Jan 27, 2026
6149ccb
Refactored ReminderItemFormView to use `LocalDateTime` for time handling
on23mk Jan 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,9 @@ import kotlinx.coroutines.flow.first
import kotlinx.coroutines.flow.firstOrNull
import kotlinx.coroutines.launch
import java.time.DateTimeException
import java.time.Instant
import java.time.LocalDateTime
import java.time.ZoneId
import java.time.ZonedDateTime
import java.time.format.DateTimeFormatter
import java.util.Calendar
import java.util.Date
Expand Down Expand Up @@ -156,12 +157,14 @@ class TaskAlarmManager(
) {
if (remindersItem == null) return

val now = ZonedDateTime.now().withZoneSameLocal(ZoneId.systemDefault())?.toInstant()
val reminderZonedTime = remindersItem.getLocalZonedDateTimeInstant()
val localDateTime =
remindersItem.time?.let { LocalDateTime.parse(it, DateTimeFormatter.ISO_LOCAL_DATE_TIME) }
?: return

val reminderZonedTime = localDateTime.atZone(ZoneId.systemDefault()).toInstant()

if (reminderZonedTime.isBefore(Instant.now())) return

if (reminderZonedTime == null || reminderZonedTime.isBefore(now)) {
return
}

val intent = Intent(context, TaskReceiver::class.java)
intent.action = remindersItem.id
Expand Down
39 changes: 23 additions & 16 deletions ...a/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ReminderItemFormView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import com.habitrpg.common.habitica.extensions.layoutInflater
import com.habitrpg.common.habitica.helpers.LanguageHelper
import com.habitrpg.shared.habitica.models.tasks.TaskType
import java.text.DateFormat
import java.time.LocalDateTime
import java.time.ZonedDateTime
import java.time.format.DateTimeFormatter
import java.util.Date
Expand Down Expand Up @@ -61,6 +62,11 @@ constructor(
}
}

private fun currentLocalDateTime(): LocalDateTime =
item.time
?.let { LocalDateTime.parse(it, DateTimeFormatter.ISO_LOCAL_DATE_TIME) }
?: LocalDateTime.now()

var taskType = TaskType.DAILY
var item: RemindersItem = RemindersItem()
set(value) {
Expand Down Expand Up @@ -130,30 +136,31 @@ constructor(
binding.button.drawable.mutate().setTint(tintColor)

binding.textView.setOnClickListener {
val ldt = currentLocalDateTime()

if (taskType == TaskType.DAILY) {
val timePickerDialog =
TimePickerDialog(
context,
this,
item.getZonedDateTime()?.hour ?: ZonedDateTime.now().hour,
item.getZonedDateTime()?.minute ?: ZonedDateTime.now().minute,
android.text.format.DateFormat.is24HourFormat(context)
)
timePickerDialog.show()
TimePickerDialog(
context,
this,
ldt.hour,
ldt.minute,
android.text.format.DateFormat.is24HourFormat(context)
).show()
} else {
val zonedDateTime = (item.getZonedDateTime() ?: ZonedDateTime.now())
val timePickerDialog =
val datePickerDialog =
DatePickerDialog(
context,
this,
zonedDateTime.year,
zonedDateTime.monthValue - 1,
zonedDateTime.dayOfMonth
ldt.year,
ldt.monthValue - 1,
ldt.dayOfMonth
)

if ((firstDayOfWeek ?: -1) >= 0) {
timePickerDialog.datePicker.firstDayOfWeek = firstDayOfWeek ?: 0
datePickerDialog.datePicker.firstDayOfWeek = firstDayOfWeek ?: 0
}
timePickerDialog.show()

datePickerDialog.show()
}
}
binding.textView.labelFor = binding.button.id
Expand Down