# This is a combination of 2 commits.

# This is the 1st commit message:

Fix missing home zone on the first location update after high accuracy mode turns off

# This is the commit message #2:

Potential fix for pull request finding

Use junit without jupiter.

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Author: eyal0

app/src/full/kotlin/io/homeassistant/companion/android/sensors/LocationSensorManager.kt

@@ -924,7 +924,9 @@ class LocationSensorManager @Inject constructor(
             val inZones = zones
                 .filter {
                     val radius = it.attributes["radius"] as? Number
-                    return@filter radius != null && it.containsWithAccuracy(location)
+                    val matchesGps = radius != null && it.containsWithAccuracy(location)
+                    val matchesGeofence = lastEnteredGeoZones.contains("${serverId}_${it.entityId}")
+                    return@filter matchesGps || matchesGeofence
                 }.sortedWith(
                     // Smallest zone (radius) first; when two zones share the same radius, prefer the one
                     // whose center is closest to the current location to break the tie deterministically.
@@ -958,11 +960,20 @@ class LocationSensorManager @Inject constructor(
             )
             updateLocationString = locationName
         } else {
+            val enteredZoneIds = getZones(serverId).map { it.entityId }.filter { entityId ->
+                lastEnteredGeoZones.contains("${serverId}_$entityId")
+            }
             updateLocation = UpdateLocation(
                 gps = listOf(location.latitude, location.longitude),
                 gpsAccuracy = accuracy,
                 locationName = null,
-                inZones = null,
+                inZones = if (enteredZoneIds.isNotEmpty() &&
+                    serverManager.getServer(serverId)?.version?.isAtLeast(2026, 6, 0) == true
+                ) {
+                    enteredZoneIds
+                } else {
+                    null
+                },
                 speed = location.speed.toInt(),
                 altitude = location.altitude.toInt(),
                 course = location.bearing.toInt(),
@@ -989,7 +1000,7 @@ class LocationSensorManager @Inject constructor(
             return
         }
 
-        if (location.time < (lastLocationSend[serverId] ?: 0)) {
+        if (location.time < (lastLocationSend[serverId] ?: 0) && trigger?.isGeofence != true) {
             Timber.d(
                 "Skipping old location update since time is before the last one we sent, received: ${location.time} last sent: $lastLocationSend",
             )
@@ -1002,7 +1013,7 @@ class LocationSensorManager @Inject constructor(
                 "Received location that is ${now - location.time} milliseconds old, ${location.time} compared to $now with source ${location.provider}",
             )
             if (lastUpdateLocation[serverId] == updateLocationString) {
-                if (now < (lastLocationSend[serverId] ?: 0) + 900000) {
+                if (now < (lastLocationSend[serverId] ?: 0) + 900000 && trigger?.isGeofence != true) {
                     Timber.d("Duplicate location received, not sending to HA")
                     logLocationUpdate(
                         location,

app/src/main/res/xml/changelog_master.xml

@@ -2,6 +2,7 @@
 <changelog xmlns:tools="http://schemas.android.com/tools"
     tools:ignore="MissingDefaultResource">
     <release version="2026.8.4 - Main" versioncode="3">
+        <change>Fix missing zone on the first location update after high accuracy mode turns off</change>
         <change>Android 17: added assistant volume level sensor + notification command for control</change>
         <change>Health Connect sleep duration sensor now ignores awake and out of bed time</change>
         <change>Modernized settings for entity widgets and tiles</change>
@@ -12,6 +13,7 @@
         <change>Bug fixes and dependency updates</change>
     </release>
     <release version="2026.8.4 - Automotive" versioncode="1">
+        <change>Fix missing zone on the first location update after high accuracy mode turns off</change>
         <change>Android 17: added assistant volume level sensor + notification command for control</change>
         <change>Health Connect sleep duration sensor now ignores awake and out of bed time</change>
         <change>Bug fixes and dependency updates</change>