From 18de60f68c9652bbba1d266d0a1022f34aac0d1e Mon Sep 17 00:00:00 2001 From: LoveSy Date: Thu, 27 Jan 2022 07:15:32 +0800 Subject: [PATCH] Fix NPE of `SuRequestViewModel` countdown timer may have not initialized when backpressed --- .../com/topjohnwu/magisk/ui/surequest/SuRequestViewModel.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestViewModel.kt index 4a139c6b0..7e9690819 100644 --- a/app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestViewModel.kt +++ b/app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestViewModel.kt @@ -73,7 +73,7 @@ class SuRequestViewModel( val itemBinding = ItemBinding.of(BR.item, R.layout.item_spinner) private val handler = SuRequestHandler(AppContext.packageManager, policyDB) - private lateinit var timer: CountDownTimer + private var timer: CountDownTimer? = null fun grantPressed() { cancelTimer() @@ -121,7 +121,7 @@ class SuRequestViewModel( } private fun respond(action: Int) { - timer.cancel() + timer?.cancel() val pos = selectedItemPosition timeoutPrefs.edit().putInt(handler.policy.packageName, pos).apply() @@ -132,7 +132,7 @@ class SuRequestViewModel( } private fun cancelTimer() { - timer.cancel() + timer?.cancel() denyText.seconds = 0 }