voussoir/trkpt
1
0
Fork 0
Code Issues Projects Releases Packages Activity

Dedent this code with a continue.

Browse source
This commit is contained in:
voussoir 2023-04-02 12:12:32 -07:00
parent 61169a56de
commit 1a18ac22e4
1 changed files with 25 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
app/src/main/java/net/voussoir/trkpt/TrackerService.kt
View file

@ -253,32 +253,33 @@ class TrackerService: Service()
// very inaccurate points so if those bail early we'd stay in sleep mode. // very inaccurate points so if those bail early we'd stay in sleep mode.
for ((index, homepoint) in trackbook.homepoints.withIndex()) for ((index, homepoint) in trackbook.homepoints.withIndex())
{ {
if (homepoint.location.distanceTo(location) < homepoint.radius) if (homepoint.location.distanceTo(location) > homepoint.radius)
{ {
Log.i("VOUSSOIR", "Omitting due to homepoint ${index} ${homepoint.name}.") continue
if (index > 0)
{
trackbook.homepoints.remove(homepoint)
trackbook.homepoints.addFirst(homepoint)
}
if (arrived_at_home == 0L)
{
Log.i("VOUSSOIR", "Arrived at home.")
arrived_at_home = System.currentTimeMillis()
}
else if (
allow_sleep &&
has_motion_sensor &&
location_interval != Keys.LOCATION_INTERVAL_SLEEP &&
(System.currentTimeMillis() - arrived_at_home) > TIME_UNTIL_SLEEP &&
(System.currentTimeMillis() - last_significant_motion) > TIME_UNTIL_SLEEP
)
{
Log.i("VOUSSOIR", "Staying at home, sleeping.")
reset_location_listeners(interval=Keys.LOCATION_INTERVAL_SLEEP)
}
return
} }
Log.i("VOUSSOIR", "Omitting due to homepoint ${index} ${homepoint.name}.")
if (index > 0)
{
trackbook.homepoints.remove(homepoint)
trackbook.homepoints.addFirst(homepoint)
}
if (arrived_at_home == 0L)
{
Log.i("VOUSSOIR", "Arrived at home.")
arrived_at_home = System.currentTimeMillis()
}
else if (
allow_sleep &&
has_motion_sensor &&
location_interval != Keys.LOCATION_INTERVAL_SLEEP &&
(System.currentTimeMillis() - arrived_at_home) > TIME_UNTIL_SLEEP &&
(System.currentTimeMillis() - last_significant_motion) > TIME_UNTIL_SLEEP
)
{
Log.i("VOUSSOIR", "Staying at home, sleeping.")
reset_location_listeners(interval=Keys.LOCATION_INTERVAL_SLEEP)
}
return
} }
if (arrived_at_home > 0) if (arrived_at_home > 0)
{ {