Make countdownTimer nullable in TimerService
This commit is contained in:
parent
c44c57e1c4
commit
3abc4da861
|
@ -17,7 +17,7 @@ import kotlin.math.floor
|
||||||
|
|
||||||
class TimerService() : Service() {
|
class TimerService() : Service() {
|
||||||
private lateinit var manager: NotificationManager
|
private lateinit var manager: NotificationManager
|
||||||
private lateinit var countdownTimer: CountDownTimer
|
private var countdownTimer: CountDownTimer? = null
|
||||||
private var endMs: Int = 0
|
private var endMs: Int = 0
|
||||||
private var currentMs: Long = 0
|
private var currentMs: Long = 0
|
||||||
private var vibrate: Boolean = true
|
private var vibrate: Boolean = true
|
||||||
|
@ -37,9 +37,9 @@ class TimerService() : Service() {
|
||||||
Log.d("TimerService", "endMs=$endMs,currentMs=$currentMs,vibrate=$vibrate,sound=$sound")
|
Log.d("TimerService", "endMs=$endMs,currentMs=$currentMs,vibrate=$vibrate,sound=$sound")
|
||||||
manager = getManager(applicationContext)
|
manager = getManager(applicationContext)
|
||||||
val builder = getBuilder(applicationContext)
|
val builder = getBuilder(applicationContext)
|
||||||
countdownTimer.cancel()
|
countdownTimer?.cancel()
|
||||||
countdownTimer = getTimer(builder)
|
countdownTimer = getTimer(builder)
|
||||||
countdownTimer.start()
|
countdownTimer?.start()
|
||||||
return super.onStartCommand(intent, flags, startId)
|
return super.onStartCommand(intent, flags, startId)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -103,7 +103,7 @@ class TimerService() : Service() {
|
||||||
|
|
||||||
override fun onDestroy() {
|
override fun onDestroy() {
|
||||||
Log.d("TimerService", "Destroying...")
|
Log.d("TimerService", "Destroying...")
|
||||||
countdownTimer.cancel()
|
countdownTimer?.cancel()
|
||||||
manager.cancel(NOTIFICATION_ID_PENDING)
|
manager.cancel(NOTIFICATION_ID_PENDING)
|
||||||
manager.cancel(NOTIFICATION_ID_DONE)
|
manager.cancel(NOTIFICATION_ID_DONE)
|
||||||
super.onDestroy()
|
super.onDestroy()
|
||||||
|
|
Loading…
Reference in New Issue
Block a user