From f68f0175a6a422986243f7cb800777cd89e2518e Mon Sep 17 00:00:00 2001
From: MM20 <15646950+MM2-0@users.noreply.github.com>
Date: Fri, 17 May 2024 18:18:33 +0200
Subject: [PATCH] Fix OpeningSchedule.isOpen

Fix #838
---
 .../src/main/java/de/mm20/launcher2/search/Location.kt   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/core/base/src/main/java/de/mm20/launcher2/search/Location.kt b/core/base/src/main/java/de/mm20/launcher2/search/Location.kt
index 49c08330..d8ea356b 100644
--- a/core/base/src/main/java/de/mm20/launcher2/search/Location.kt
+++ b/core/base/src/main/java/de/mm20/launcher2/search/Location.kt
@@ -11,6 +11,7 @@ import java.time.DayOfWeek
 import java.time.Duration
 import java.time.LocalDateTime
 import java.time.LocalTime
+import java.time.temporal.TemporalAdjusters
 import android.location.Location as AndroidLocation
 
 interface Location : SavableSearchable {
@@ -235,9 +236,9 @@ data class OpeningHours(
 ) {
 
     fun isOpen(date: LocalDateTime = LocalDateTime.now()): Boolean {
-        return date.dayOfWeek == dayOfWeek &&
-                date.toLocalTime().isAfter(startTime) &&
-                date.toLocalTime().isBefore(startTime.plus(duration))
+        val startTime = date.with(TemporalAdjusters.previousOrSame(dayOfWeek)).with(startTime)
+        val endTime = startTime.plus(duration)
+        return date in startTime..<endTime
     }
 
     override fun toString(): String = "$dayOfWeek $startTime-${startTime.plus(duration)}"
@@ -250,4 +251,4 @@ data class OpeningSchedule(
     fun isOpen(date: LocalDateTime = LocalDateTime.now()): Boolean {
         return isTwentyFourSeven || openingHours.any { it.isOpen(date) }
     }
-}
+}
\ No newline at end of file