demus/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge.git synced 2026-07-31 07:44:24 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

WeatherSpec: compute night correctly when sunrise and sunset are on different UTC dates

Browse Source
This commit is contained in:
Avery Sterk
2026-04-20 09:01:20 -05:00
parent b95ad084d6
commit 40336b570f
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/WeatherSpec.kt
+6 -3
View File
@@ -168,9 +168,12 @@ class WeatherSpec() : Parcelable {
fun isTimeNight(unixTimeMilliSeconds: Long): Boolean {
if (isPolarNight()) return true
if (isPolarDay()) return false
val millisPastMidnight = unixTimeMilliSeconds % 86400000
if ( millisPastMidnight < (this.sunRise % 86400 * 1000L ) ) return true
return ( millisPastMidnight > (this.sunSet % 86400 * 1000L ) )
// Compute where our time falls relative to sunrise. Negative numbers mean before sunrise.
val millisAfterSunrise = unixTimeMilliSeconds - (this.sunRise * 1000L)
// Compute where sunset falls relative to sunrise. We assume it's always after, thus giving a positive number.
val lengthOfSolarDayInMillis = (this.sunSet - this.sunRise) * 1000L
// Map the input time into positive time in a 24-hour solar cycle, and compare to sunset.
return ( millisAfterSunrise.mod(86400000) > lengthOfSolarDayInMillis )
}
fun getLocationObject(): Location? {