Skip to content

only sync geofences if track successful #465

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

only sync geofences if track successful #465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fa4c86d
only sync geofences if track successful
ShiCheng-Lu Sep 23, 2025
485545e
.
ShiCheng-Lu Sep 23, 2025
a101bfa
rm debug log
ShiCheng-Lu Oct 7, 2025
58afe2b
make removeSyncedGeofence private
ShiCheng-Lu Oct 7, 2025
2e17d79
rm unused import
ShiCheng-Lu Oct 7, 2025
c7627e8
move sync back to location manager
ShiCheng-Lu Oct 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions sdk/src/main/java/io/radar/sdk/RadarApiClient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import android.os.SystemClock
import io.radar.sdk.Radar.RadarAddressVerificationStatus
import io.radar.sdk.Radar.RadarLocationSource
import io.radar.sdk.Radar.RadarStatus
import io.radar.sdk.Radar.isTracking
import io.radar.sdk.Radar.locationManager
import io.radar.sdk.model.RadarAddress
import io.radar.sdk.model.RadarBeacon
Expand Down Expand Up @@ -514,10 +515,11 @@ internal class RadarApiClient(
val nearbyGeofences = res.optJSONArray("nearbyGeofences")?.let { nearbyGeofencesArr ->
RadarGeofence.fromJson(nearbyGeofencesArr)
}

val token = RadarVerifiedLocationToken.fromJson(res)

if (user != null) {
val inGeofences = user.geofences != null && user.geofences.isNotEmpty()
val inGeofences = !user.geofences.isNullOrEmpty()
val atPlace = user.place != null
val canExit = inGeofences || atPlace
RadarState.setCanExit(context, canExit)
Expand Down Expand Up @@ -649,7 +651,7 @@ internal class RadarApiClient(
RadarEvent.fromJson(eventsArr)
}

if (events != null && events.isNotEmpty()) {
if (!events.isNullOrEmpty()) {
Radar.sendEvents(events)
}

Expand Down
8 changes: 5 additions & 3 deletions sdk/src/main/java/io/radar/sdk/RadarLocationManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import io.radar.sdk.Radar.RadarLocationServicesProvider.HUAWEI
import io.radar.sdk.Radar.RadarLocationSource
import io.radar.sdk.Radar.RadarLogType
import io.radar.sdk.Radar.RadarStatus
import io.radar.sdk.Radar.isTracking
import io.radar.sdk.RadarApiClient.RadarTrackApiCallback
import io.radar.sdk.RadarTrackingOptions.RadarTrackingOptionsDesiredAccuracy
import io.radar.sdk.RadarTrackingOptions.RadarTrackingOptionsSyncGeofences
Expand Down Expand Up @@ -375,7 +376,7 @@ internal class RadarLocationManager(
}
}

private fun replaceSyncedGeofences(radarGeofences: Array<RadarGeofence>?) {
internal fun replaceSyncedGeofences(radarGeofences: Array<RadarGeofence>?) {
this.removeSyncedGeofences() { success ->
this.addSyncedGeofences(radarGeofences)
}
Expand Down Expand Up @@ -647,13 +648,14 @@ internal class RadarLocationManager(
config: RadarConfig?,
token: RadarVerifiedLocationToken?
) {
locationManager.replaceSyncedGeofences(nearbyGeofences)

if (options.foregroundServiceEnabled && foregroundService.updatesOnly) {
locationManager.stopForegroundService()
}

updateTrackingFromMeta(config?.meta)
if (status == RadarStatus.SUCCESS && nearbyGeofences != null && isTracking()) {
Radar.locationManager.replaceSyncedGeofences(nearbyGeofences)
}
}
})
}
Expand Down