From 3082849fb5b80a518e2883a579202bc08e6a21c9 Mon Sep 17 00:00:00 2001 From: lhwdev Date: Mon, 11 Oct 2021 12:03:49 +0900 Subject: [PATCH] Fixed bug: push date to next day on alarm --- app/src/main/java/com/lhwdev/selfTestMacro/AlarmReceiver.kt | 2 +- app/src/main/java/com/lhwdev/selfTestMacro/selfTestUtils.kt | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/lhwdev/selfTestMacro/AlarmReceiver.kt b/app/src/main/java/com/lhwdev/selfTestMacro/AlarmReceiver.kt index 09f5a8ba..30b5a3a8 100644 --- a/app/src/main/java/com/lhwdev/selfTestMacro/AlarmReceiver.kt +++ b/app/src/main/java/com/lhwdev/selfTestMacro/AlarmReceiver.kt @@ -27,7 +27,7 @@ class AlarmReceiver : BroadcastReceiver() { } val pref = PreferenceState(context.prefMain()) - context.scheduleNextAlarm(context.createIntent(), pref.hour, pref.min, true) + context.scheduleNextAlarm(context.createIntent(), pref.hour, pref.min, pref.isRandomEnabled, nextDay = true) lock.release() result.finish() diff --git a/app/src/main/java/com/lhwdev/selfTestMacro/selfTestUtils.kt b/app/src/main/java/com/lhwdev/selfTestMacro/selfTestUtils.kt index be3dacac..a2ec6667 100644 --- a/app/src/main/java/com/lhwdev/selfTestMacro/selfTestUtils.kt +++ b/app/src/main/java/com/lhwdev/selfTestMacro/selfTestUtils.kt @@ -109,7 +109,9 @@ fun Context.scheduleNextAlarm( new[Calendar.MINUTE] = newMin new[Calendar.SECOND] = 0 new[Calendar.MILLISECOND] = 0 - if(nextDay || new <= this) new.add(Calendar.DAY_OF_YEAR, 1) + if(nextDay || new <= this || new[Calendar.DAY_OF_YEAR] == this[Calendar.DAY_OF_YEAR]) { + new.add(Calendar.DAY_OF_YEAR, 1) + } new } selfLog("scheduling next alarm at ${Date.from(newTime.toInstant())}", force = true)