From 6f159b73b73119809b285781f9e62501c38020d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophile=20Delmas?= Date: Thu, 21 Dec 2023 20:17:33 +0100 Subject: [PATCH] fix implicit tomorrow intent --- app/src/main/java/com/rooster/rooster/AlarmHandler.kt | 8 ++++---- .../main/java/com/rooster/rooster/AlarmclockReceiver.kt | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/rooster/rooster/AlarmHandler.kt b/app/src/main/java/com/rooster/rooster/AlarmHandler.kt index e71668b..2ecd603 100644 --- a/app/src/main/java/com/rooster/rooster/AlarmHandler.kt +++ b/app/src/main/java/com/rooster/rooster/AlarmHandler.kt @@ -75,14 +75,14 @@ class AlarmHandler { var closestAlarm: Alarm? = null var timeDifference: Long = Long.MAX_VALUE val dayFormat = SimpleDateFormat("EEEE", Locale.getDefault()) - val today: String = dayFormat.format(currentTime.time) for (alarm in alarms) { + val alarmTime = Calendar.getInstance() + alarmTime.timeInMillis = alarm.calculatedTime + val alarmDay: String = dayFormat.format(alarmTime.time) if (alarm.enabled && - (alarm.getDayEnabled(today) || + (alarm.getDayEnabled(alarmDay) || (!alarm.monday && !alarm.tuesday && !alarm.wednesday && !alarm.thursday && !alarm.friday && !alarm.saturday && !alarm.sunday))) { - val alarmTime = Calendar.getInstance() - alarmTime.timeInMillis = alarm.calculatedTime val alarmMillis = alarmTime.timeInMillis // Calculate the time difference between current time and alarm time diff --git a/app/src/main/java/com/rooster/rooster/AlarmclockReceiver.kt b/app/src/main/java/com/rooster/rooster/AlarmclockReceiver.kt index 60d50cb..31aa3f6 100644 --- a/app/src/main/java/com/rooster/rooster/AlarmclockReceiver.kt +++ b/app/src/main/java/com/rooster/rooster/AlarmclockReceiver.kt @@ -63,7 +63,6 @@ class AlarmclockReceiver : BroadcastReceiver() { alarmHandler.setNextAlarm(context) }, delay) } else if (intent != null && "android.intent.action.BOOT_COMPLETED" == intent.action) { - // Retrieve saved alarms from persistent storage alarmHandler.setNextAlarm(context) } }