mirror of
https://github.com/libre-tube/LibreTube.git
synced 2024-12-14 06:10:31 +05:30
Improve time check in NotificationWorker.
This commit is contained in:
parent
5d6f2ae350
commit
e8a8b6a0da
@ -54,24 +54,19 @@ class NotificationWorker(appContext: Context, parameters: WorkerParameters) :
|
||||
* Determine whether the time is valid to notify
|
||||
*/
|
||||
private fun checkTime(): Boolean {
|
||||
if (!PreferenceHelper.getBoolean(
|
||||
PreferenceKeys.NOTIFICATION_TIME_ENABLED,
|
||||
false
|
||||
)
|
||||
) {
|
||||
if (!PreferenceHelper.getBoolean(PreferenceKeys.NOTIFICATION_TIME_ENABLED, false)) {
|
||||
return true
|
||||
}
|
||||
|
||||
val start = getTimePickerPref(PreferenceKeys.NOTIFICATION_START_TIME)
|
||||
val end = getTimePickerPref(PreferenceKeys.NOTIFICATION_END_TIME)
|
||||
|
||||
val currentTime = LocalTime.now()
|
||||
val isOverNight = start > end
|
||||
|
||||
val startValid = if (isOverNight) start > currentTime else start < currentTime
|
||||
val endValid = if (isOverNight) end < currentTime else start > currentTime
|
||||
|
||||
return (startValid && endValid)
|
||||
return if (start > end) {
|
||||
currentTime !in end..start
|
||||
} else {
|
||||
currentTime in start..end
|
||||
}
|
||||
}
|
||||
|
||||
private fun getTimePickerPref(key: String): LocalTime {
|
||||
|
Loading…
Reference in New Issue
Block a user