fix: timer service not starting as a foreground service (closes you-a…

…pps#346)
M00NJ · Jun 13, 2024 · 1e2123f · 1e2123f
1 parent d5d39ab
commit 1e2123f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/app/src/main/java/com/bnyro/clock/presentation/screens/timer/model/TimerModel.kt b/app/src/main/java/com/bnyro/clock/presentation/screens/timer/model/TimerModel.kt
@@ -79,7 +79,7 @@ class TimerModel : ViewModel() {
         timePickerSeconds = 0
         timePickerFakeUnits = 0
 
-        if (onEnqueue == null) {
+        if (_timerObjects.value.isEmpty()) {
             startService(context, newTimer)
         } else {
             onEnqueue?.invoke(newTimer.asScheduledObject())

diff --git a/app/src/main/java/com/bnyro/clock/ui/MainActivity.kt b/app/src/main/java/com/bnyro/clock/ui/MainActivity.kt
@@ -77,6 +77,8 @@ class MainActivity : ComponentActivity() {
             timerModel.updateLabel = timerService::updateLabel
             timerModel.updateRingtone = timerService::updateRingtone
             timerModel.updateVibrate = timerService::updateVibrate
+
+            timerService.invokeChangeListener()
         }
 
         override fun onServiceDisconnected(p0: ComponentName?) {

diff --git a/app/src/main/java/com/bnyro/clock/util/services/TimerService.kt b/app/src/main/java/com/bnyro/clock/util/services/TimerService.kt
@@ -20,7 +20,6 @@ import androidx.annotation.StringRes
 import androidx.core.app.ActivityCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
-import androidx.core.app.ServiceCompat
 import com.bnyro.clock.R
 import com.bnyro.clock.domain.model.TimerDescriptor
 import com.bnyro.clock.domain.model.TimerObject
@@ -97,7 +96,7 @@ class TimerService : Service() {
         return START_STICKY
     }
 
-    fun getNotification(timerObject: TimerObject) = NotificationCompat.Builder(
+    private fun getNotification(timerObject: TimerObject) = NotificationCompat.Builder(
         this,
         NotificationHelper.TIMER_CHANNEL
     )
@@ -118,13 +117,14 @@ class TimerService : Service() {
         .addAction(stopAction(timerObject))
         .addAction(pauseResumeAction(timerObject))
         .setSmallIcon(R.drawable.ic_notification)
+        .setOngoing(true)
         .build()
 
     fun invokeChangeListener() {
         onChangeTimers.invoke(timerObjects.toTypedArray())
     }
 
-    fun updateState() {
+    private fun updateState() {
         val stopped = mutableListOf<TimerObject>()
         timerObjects.forEach {
             if (it.state.value == WatchState.RUNNING) {
@@ -154,17 +154,17 @@ class TimerService : Service() {
     }
 
 
-    fun pause(timerObject: TimerObject) {
+    private fun pause(timerObject: TimerObject) {
         timerObject.state.value = WatchState.PAUSED
         updateNotification(timerObject)
     }
 
-    fun resume(timerObject: TimerObject) {
+    private fun resume(timerObject: TimerObject) {
         timerObject.state.value = WatchState.RUNNING
         updateNotification(timerObject)
     }
 
-    fun updateNotification(timerObject: TimerObject) {
+    private fun updateNotification(timerObject: TimerObject) {
         if (ActivityCompat.checkSelfPermission(
                 this,
                 Manifest.permission.POST_NOTIFICATIONS
@@ -175,7 +175,7 @@ class TimerService : Service() {
         }
     }
 
-    fun stop(timerObject: TimerObject, cancelled: Boolean) {
+    private fun stop(timerObject: TimerObject, cancelled: Boolean) {
         timerObjects.remove(timerObject)
         invokeChangeListener()
         if (cancelled) {
@@ -207,7 +207,7 @@ class TimerService : Service() {
         }
     }
 
-    fun pauseResumeAction(timerObject: TimerObject): NotificationCompat.Action {
+    private fun pauseResumeAction(timerObject: TimerObject): NotificationCompat.Action {
         val text =
             if (timerObject.state.value == WatchState.PAUSED) R.string.resume else R.string.pause
         return getAction(text, ACTION_PAUSE_RESUME, 5, timerObject.id)
@@ -231,7 +231,7 @@ class TimerService : Service() {
         return NotificationCompat.Action.Builder(null, getString(stringRes), pendingIntent).build()
     }
 
-    fun stopAction(timerObject: TimerObject) = getAction(
+    private fun stopAction(timerObject: TimerObject) = getAction(
         R.string.stop,
         ACTION_STOP,
         4,
@@ -261,13 +261,10 @@ class TimerService : Service() {
             unregisterReceiver(receiver)
         }
         timer.cancel()
-        ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
-        stopSelf()
-
         super.onDestroy()
     }
 
-    fun getStartNotification() = NotificationCompat.Builder(
+    private fun getStartNotification() = NotificationCompat.Builder(
         this,
         NotificationHelper.TIMER_SERVICE_CHANNEL
     )