Prevent GeofencingRequest exception on no zones (home-assistant#3857)

RoboMagus · Sep 13, 2023 · fb1bdc0 · fb1bdc0
1 parent 4163e14
commit fb1bdc0
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/app/src/full/java/io/homeassistant/companion/android/sensors/LocationSensorManager.kt b/app/src/full/java/io/homeassistant/companion/android/sensors/LocationSensorManager.kt
@@ -650,10 +650,14 @@ class LocationSensorManager : LocationSensorManagerBase() {
             geofencingClient = LocationServices.getGeofencingClient(latestContext)
             val intent = getLocationUpdateIntent(true)
             val geofencingRequest = createGeofencingRequest()
-            geofencingClient?.addGeofences(
-                geofencingRequest,
-                intent
-            )
+            if (geofencingRequest != null) {
+                geofencingClient?.addGeofences(
+                    geofencingRequest,
+                    intent
+                )
+            } else {
+                Log.w(TAG, "No zones, skipping zone based location updates")
+            }
         } catch (e: Exception) {
             Log.e(TAG, "Issue requesting zone updates.", e)
         }
@@ -934,26 +938,29 @@ class LocationSensorManager : LocationSensorManagerBase() {
         return zones[serverId] ?: emptyArray()
     }
 
-    private suspend fun createGeofencingRequest(): GeofencingRequest {
+    private suspend fun createGeofencingRequest(): GeofencingRequest? {
         val geofencingRequestBuilder = GeofencingRequest.Builder()
             .setInitialTrigger(GeofencingRequest.INITIAL_TRIGGER_ENTER)
 
         val highAccuracyTriggerRange = getHighAccuracyModeTriggerRange()
         val highAccuracyZones = getHighAccuracyModeZones(false)
 
+        var geofenceCount = 0
         getEnabledServers(latestContext, zoneLocation).map { serverId ->
             ioScope.async {
                 val configuredZones = getZones(serverId, forceRefresh = true)
                 configuredZones.forEach {
                     addGeofenceToBuilder(geofencingRequestBuilder, serverId, it)
+                    geofenceCount++
                     if (highAccuracyTriggerRange > 0 && highAccuracyZones.contains("${serverId}_${it.entityId}")) {
                         addGeofenceToBuilder(geofencingRequestBuilder, serverId, it, highAccuracyTriggerRange)
+                        geofenceCount++
                     }
                 }
                 geofenceRegistered.add(serverId)
             }
         }.awaitAll()
-        return geofencingRequestBuilder.build()
+        return if (geofenceCount > 0) geofencingRequestBuilder.build() else null
     }
 
     private fun addGeofenceToBuilder(