mobile/home-assistant-android
mobile/home-assistant-android
1
0
Fork 0
mirror of https://github.com/home-assistant/android synced 2024-10-06 16:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent GeofencingRequest exception on no zones (#3857)

Browse source
This commit is contained in:
Joris Pelgröm 2023-09-13 03:48:53 +02:00 committed by GitHub
parent 4163e1465e
commit fb1bdc05bb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/src/full/java/io/homeassistant/companion/android/sensors/LocationSensorManager.kt
View file

@ -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(