diff --git a/app/src/main/java/org/nsh07/pomodoro/service/AddActions.kt b/app/src/main/java/org/nsh07/pomodoro/service/AddActions.kt index 181e4f9..b410a75 100644 --- a/app/src/main/java/org/nsh07/pomodoro/service/AddActions.kt +++ b/app/src/main/java/org/nsh07/pomodoro/service/AddActions.kt @@ -34,7 +34,7 @@ fun NotificationCompat.Builder.addTimerActions( ) .addAction( R.drawable.restart, - "Reset", + "Exit", PendingIntent.getService( context, 0, diff --git a/app/src/main/java/org/nsh07/pomodoro/service/TimerService.kt b/app/src/main/java/org/nsh07/pomodoro/service/TimerService.kt index 6e6d33c..2828a34 100644 --- a/app/src/main/java/org/nsh07/pomodoro/service/TimerService.kt +++ b/app/src/main/java/org/nsh07/pomodoro/service/TimerService.kt @@ -82,7 +82,6 @@ class TimerService : Service() { } override fun onDestroy() { - super.onDestroy() timerRepository.serviceRunning = false runBlocking { job.cancel() @@ -90,6 +89,7 @@ class TimerService : Service() { notificationManager.cancel(1) alarm?.release() } + super.onDestroy() } override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {