Merge pull request #17 from kirasok/cancel_on_delete

feat(domain): cancel alarm before deleting it
kirasok · Apr 3, 2024 · a757135 · a757135
2 parents 6df42e3 + ab6f79d
commit a757135
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/app/src/main/java/io/github/kirasok/alarmix/di/AppModule.kt b/app/src/main/java/io/github/kirasok/alarmix/di/AppModule.kt
@@ -50,6 +50,6 @@ object AppModule {
     GetAlarms(repository),
     GetAlarmById(repository),
     InsertAlarm(repository, validator, scheduler),
-    DeleteAlarm(repository),
+    DeleteAlarm(repository, scheduler),
   )
 }
diff --git a/app/src/main/java/io/github/kirasok/alarmix/domain/use_case/AlarmUseCases.kt b/app/src/main/java/io/github/kirasok/alarmix/domain/use_case/AlarmUseCases.kt
@@ -38,10 +38,11 @@ class InsertAlarm(
   }
 }
 
-class DeleteAlarm(private val repository: AlarmRepository) {
+class DeleteAlarm(private val repository: AlarmRepository, private val scheduler: AlarmScheduler) {
   suspend operator fun invoke(
     alarm: Alarm,
   ) {
+    scheduler.cancel(alarm)
     repository.deleteAlarm(alarm)
   }
 }

diff --git a/app/src/main/java/io/github/kirasok/alarmix/presentation/receiver/AlarmService.kt b/app/src/main/java/io/github/kirasok/alarmix/presentation/receiver/AlarmService.kt
@@ -167,13 +167,13 @@ class AlarmService : Service(), MediaPlayer.OnPreparedListener, MediaPlayer.OnEr
     val dismissIntent =
       Intent(ALARM_ACTION_KEY).putExtra(ALARM_ACTION_KEY, AlarmAction.DISMISS.toString())
     val dismissAction =
-      NotificationCompat.Action.Builder(null, "Dismiss", getPendingIntent(dismissIntent, alarm.id))
+      NotificationCompat.Action.Builder(null, "Dismiss", getPendingIntent(dismissIntent, 1))
         .build()
 
     val snoozeIntent =
       Intent(ALARM_ACTION_KEY).putExtra(ALARM_ACTION_KEY, AlarmAction.SNOOZE.toString())
     val snoozeAction =
-      NotificationCompat.Action.Builder(null, "Snooze", getPendingIntent(snoozeIntent, alarm.id))
+      NotificationCompat.Action.Builder(null, "Snooze", getPendingIntent(snoozeIntent, 2))
         .build()
 
     return NotificationCompat.Builder(
@@ -199,7 +199,7 @@ class AlarmService : Service(), MediaPlayer.OnPreparedListener, MediaPlayer.OnEr
 
   companion object {
 
-    const val ALARM_ACTION_KEY = "alarm_action_key"
+    const val ALARM_ACTION_KEY = "io.github.kirasok.alarm_action_key"
 
     enum class AlarmAction {
       DISMISS, SNOOZE