Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Fixed the AOS window filter so it follows the UTC setting (#252)
wty2019wty1d07f76adaec
diff --git a/core/data/src/main/java/com/rtbishop/look4sat/core/data/repository/SatelliteRepo.kt b/core/data/src/main/java/com/rtbishop/look4sat/core/data/repository/SatelliteRepo.ktindex 464f870b..8dbc4c91 100644--- a/core/data/src/main/java/com/rtbishop/look4sat/core/data/repository/SatelliteRepo.kt+++ b/core/data/src/main/java/com/rtbishop/look4sat/core/data/repository/SatelliteRepo.kt@@ -35,6 +35,8 @@ import kotlinx.coroutines.delayimport kotlinx.coroutines.flow.MutableStateFlowimport kotlinx.coroutines.flow.StateFlowimport kotlinx.coroutines.flow.combine+import kotlinx.coroutines.flow.distinctUntilChanged+import kotlinx.coroutines.flow.mapimport kotlinx.coroutines.flow.updateimport kotlinx.coroutines.withContextimport java.util.TimeZone@@ -67,8 +69,9 @@ class SatelliteRepo(override suspend fun initRepository() = withContext(dispatcher) {combine(settingsRepo.selectedIds,- settingsRepo.stationPosition- ) { selectedIds, _ -> selectedIds }+ settingsRepo.stationPosition,+ settingsRepo.otherSettings.map { it.stateOfUtc }.distinctUntilChanged()+ ) { selectedIds, _, _ -> selectedIds }.collect { selectedIds ->_satellites.update { localStorage.getEntriesWithIds(selectedIds) }val settings = settingsRepo.passesSettings.value@@ -176,7 +179,13 @@ class SatelliteRepo(aosEndMinute: Int,invertAosTimeWindow: Boolean): Boolean {- val offsetMillis = TimeZone.getDefault().getOffset(aosTime).toLong()+ // Must match the timezone used to display pass times (UTC toggle vs device local)+ val tz = if (settingsRepo.otherSettings.value.stateOfUtc) {+ TimeZone.getTimeZone("UTC")+ } else {+ TimeZone.getDefault()+ }+ val offsetMillis = tz.getOffset(aosTime).toLong()val localMillis = Math.floorMod(aosTime + offsetMillis, 24L * 60L * 60L * 1000L)val aosMinute = (localMillis / 60_000L).toInt()val inRange = if (aosStartMinute <= aosEndMinute) {