mirror of
https://github.com/SimpleMobileTools/Simple-Clock.git
synced 2025-02-22 22:57:41 +01:00
fix alarm snoozing
This commit is contained in:
parent
b6a7a4a22c
commit
89b543f710
@ -33,6 +33,7 @@ class ReminderActivity : SimpleActivity() {
|
|||||||
private val swipeGuideFadeHandler = Handler()
|
private val swipeGuideFadeHandler = Handler()
|
||||||
private var isAlarmReminder = false
|
private var isAlarmReminder = false
|
||||||
private var didVibrate = false
|
private var didVibrate = false
|
||||||
|
private var wasAlarmSnoozed = false
|
||||||
private var alarm: Alarm? = null
|
private var alarm: Alarm? = null
|
||||||
private var mediaPlayer: MediaPlayer? = null
|
private var mediaPlayer: MediaPlayer? = null
|
||||||
private var vibrator: Vibrator? = null
|
private var vibrator: Vibrator? = null
|
||||||
@ -228,18 +229,20 @@ class ReminderActivity : SimpleActivity() {
|
|||||||
destroyEffects()
|
destroyEffects()
|
||||||
if (config.useSameSnooze) {
|
if (config.useSameSnooze) {
|
||||||
setupAlarmClock(alarm!!, config.snoozeTime * MINUTE_SECONDS)
|
setupAlarmClock(alarm!!, config.snoozeTime * MINUTE_SECONDS)
|
||||||
|
wasAlarmSnoozed = true
|
||||||
finishActivity()
|
finishActivity()
|
||||||
} else {
|
} else {
|
||||||
showPickSecondsDialog(config.snoozeTime * MINUTE_SECONDS, true, cancelCallback = { finishActivity() }) {
|
showPickSecondsDialog(config.snoozeTime * MINUTE_SECONDS, true, cancelCallback = { finishActivity() }) {
|
||||||
config.snoozeTime = it / MINUTE_SECONDS
|
config.snoozeTime = it / MINUTE_SECONDS
|
||||||
setupAlarmClock(alarm!!, it)
|
setupAlarmClock(alarm!!, it)
|
||||||
|
wasAlarmSnoozed = true
|
||||||
finishActivity()
|
finishActivity()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun finishActivity() {
|
private fun finishActivity() {
|
||||||
if (alarm != null && alarm!!.days > 0) {
|
if (!wasAlarmSnoozed && alarm != null && alarm!!.days > 0) {
|
||||||
scheduleNextAlarm(alarm!!, false)
|
scheduleNextAlarm(alarm!!, false)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user