kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2024-12-14 22:30:30 +05:30
Code Issues Projects Releases Wiki Activity

Merge pull request #3470 from Isira-Seneviratne/Improve_time_check

Browse Source 
Improve time check in NotificationWorker.
This commit is contained in:
Isira Seneviratne 2023-04-01 16:19:45 +05:30 committed by GitHub
commit 21541b9578
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/com/github/libretube/workers/NotificationWorker.kt
View File

@ -54,24 +54,19 @@ class NotificationWorker(appContext: Context, parameters: WorkerParameters) :
* Determine whether the time is valid to notify * Determine whether the time is valid to notify
*/ */
private fun checkTime(): Boolean { private fun checkTime(): Boolean {
if (!PreferenceHelper.getBoolean( if (!PreferenceHelper.getBoolean(PreferenceKeys.NOTIFICATION_TIME_ENABLED, false)) {
PreferenceKeys.NOTIFICATION_TIME_ENABLED,
false
)
) {
return true return true
} }
val start = getTimePickerPref(PreferenceKeys.NOTIFICATION_START_TIME) val start = getTimePickerPref(PreferenceKeys.NOTIFICATION_START_TIME)
val end = getTimePickerPref(PreferenceKeys.NOTIFICATION_END_TIME) val end = getTimePickerPref(PreferenceKeys.NOTIFICATION_END_TIME)
val currentTime = LocalTime.now() val currentTime = LocalTime.now()
val isOverNight = start > end
val startValid = if (isOverNight) start > currentTime else start < currentTime return if (start > end) {
val endValid = if (isOverNight) end < currentTime else start > currentTime currentTime !in end..start
} else {
return (startValid && endValid) currentTime in start..end
}
} }
private fun getTimePickerPref(key: String): LocalTime { private fun getTimePickerPref(key: String): LocalTime {