Skip to content

[BUGFIX] 비반복 알람이 해제 후에도 다음날 예약되는 문제 해결 #249

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

Merged
DongChyeon merged 2 commits into from
Sep 8, 2025
Merged

[BUGFIX] 비반복 알람이 해제 후에도 다음날 예약되는 문제 해결 #249

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
a0721fd
[FEAT/#248] 알람 스케줄링 시 호출 함수 추적 로그 추가
DongChyeon Sep 8, 2025
57a42df
[FIX/#248] collect -> first 변경으로 DB 변경 시 반복 등록되는 버그 수정
DongChyeon Sep 8, 2025
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
16 changes: 13 additions & 3 deletions core/alarm/src/main/java/com/yapp/alarm/AndroidAlarmScheduler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package com.yapp.alarm

import android.app.AlarmManager
import android.app.Application
import android.util.Log
import com.yapp.alarm.pendingIntent.schedule.createAlarmReceiverPendingIntentForSchedule
import com.yapp.alarm.pendingIntent.schedule.createAlarmReceiverPendingIntentForUnSchedule
import com.yapp.domain.model.Alarm
Expand All @@ -16,6 +17,15 @@ class AndroidAlarmScheduler @Inject constructor(
private val alarmTimeCalculator: AlarmTimeCalculator,
) : AlarmScheduler {

private fun logSchedule(tag: String, alarm: Alarm, triggerMillis: Long, extra: String = "") {
Log.d("ScheduleTrace", "scheduleAlarm Called", Throwable())
Log.d(
"AlarmSchedule",
"[$tag] id=${alarm.id}, repeatDays=${alarm.repeatDays}, " +
"time=${java.time.Instant.ofEpochMilli(triggerMillis)} $extra",
)
}

override fun scheduleAlarm(alarm: Alarm) {
val selectedDays = alarm.repeatDays.toAlarmDays()

Expand All @@ -31,7 +41,7 @@ class AndroidAlarmScheduler @Inject constructor(
private fun setRepeatingAlarm(day: AlarmDay, alarm: Alarm) {
val triggerMillis = alarmTimeCalculator.calculateNextRepeatingTimeMillis(alarm, day)
val pendingIntent = createAlarmReceiverPendingIntentForSchedule(app, alarm, day)

logSchedule("REPEAT", alarm, triggerMillis, "day=$day")
alarmManager.setExactAndAllowWhileIdle(
AlarmManager.RTC_WAKEUP,
triggerMillis,
Expand All @@ -42,7 +52,7 @@ class AndroidAlarmScheduler @Inject constructor(
private fun setNonRepeatingAlarm(alarm: Alarm) {
val triggerMillis = alarmTimeCalculator.calculateNonRepeatingTimeMillis(alarm)
val pendingIntent = createAlarmReceiverPendingIntentForSchedule(app, alarm)

logSchedule("NON_REPEAT", alarm, triggerMillis)
alarmManager.setExactAndAllowWhileIdle(
AlarmManager.RTC_WAKEUP,
triggerMillis,
Expand All @@ -53,7 +63,7 @@ class AndroidAlarmScheduler @Inject constructor(
fun rescheduleUpcomingWeeklyAlarm(alarm: Alarm, day: AlarmDay) {
val triggerMillis = alarmTimeCalculator.calculateNextWeeklyRescheduledTimeMillis(alarm, day)
val pendingIntent = createAlarmReceiverPendingIntentForSchedule(app, alarm, day)

logSchedule("RESCHEDULE_WEEKLY", alarm, triggerMillis, "day=$day")
alarmManager.setExactAndAllowWhileIdle(
AlarmManager.RTC_WAKEUP,
triggerMillis,
Expand Down
10 changes: 5 additions & 5 deletions core/alarm/src/main/java/com/yapp/alarm/receivers/RescheduleAlarmReceiver.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import com.yapp.domain.usecase.AlarmUseCase
import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.launch
import javax.inject.Inject

Expand All @@ -31,11 +32,10 @@ class RescheduleAlarmReceiver : BroadcastReceiver() {

private fun rescheduleAlarm() {
CoroutineScope(Dispatchers.IO).launch {
alarmUseCase.getAllAlarms().collect { alarms ->
alarms.forEach { alarm ->
androidAlarmScheduler.scheduleAlarm(alarm)
}
}
val alarms = alarmUseCase.getAllAlarms().first()
alarms
.filter { it.isAlarmActive }
.forEach { alarm -> androidAlarmScheduler.scheduleAlarm(alarm) }
}
}
}