Fixed bug: cannot cancel scheduling

lhwdev · Dec 26, 2020 · 1cd2456 · 1cd2456
1 parent 5f5e593
commit 1cd2456
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -14,8 +14,8 @@ android {
 		applicationId "com.lhwdev.selfTestMacro"
 		minSdkVersion 19
 		targetSdkVersion 30
-		versionCode 1008
-		versionName "2.8"
+		versionCode 1009
+		versionName "2.9"
 
 		multiDexEnabled true
 

diff --git a/app/src/main/java/com/lhwdev/selfTestMacro/MainActivity.kt b/app/src/main/java/com/lhwdev/selfTestMacro/MainActivity.kt
@@ -95,10 +95,10 @@ class MainActivity : AppCompatActivity() {
 			if(isSchedulingEnabled) {
 				@SuppressLint("SetTextI18n")
 				time.text = "매일 자가진단: ${pref.hour}시 ${pref.min}분"
-				updateTime(intent)
 			} else {
 				time.text = "시간 예약 안 됨"
 			}
+			updateTime(intent)
 		}
 
 		fun pickTime() {

diff --git a/app/src/main/java/com/lhwdev/selfTestMacro/selfTestUtils.kt b/app/src/main/java/com/lhwdev/selfTestMacro/selfTestUtils.kt
@@ -44,7 +44,7 @@ suspend fun Context.submitSuspend(notification: Boolean = true) {
 fun Context.updateTime(intent: PendingIntent) {
 	val alarmManager = getSystemService(Context.ALARM_SERVICE) as AlarmManager
 	alarmManager.cancel(intent)
-	if(preferenceState.hour != -1)
+	if(preferenceState.isSchedulingEnabled)
 		scheduleNextAlarm(intent, preferenceState.hour, preferenceState.min)
 }