Accuracy broadcast and some minor updates

RADAR-base · Sep 24, 2023 · 38f86c2 · 38f86c2
1 parent 003eca3
commit 38f86c2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/plugins/radar-android-phone/build.gradle b/plugins/radar-android-phone/build.gradle
@@ -17,6 +17,7 @@ description = 'Basic phone sensor plugin for RADAR passive remote monitoring app
 dependencies {
     api project(':radar-commons-android')
     implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0'
+    implementation project(path: ':radar-android-google-places')
 }
 
 apply from: "$rootDir/gradle/publishing.gradle"
diff --git a/...ins/radar-android-phone/src/main/java/org/radarbase/passive/phone/PhoneLocationManager.kt b/...ins/radar-android-phone/src/main/java/org/radarbase/passive/phone/PhoneLocationManager.kt
@@ -34,6 +34,8 @@ import org.radarbase.android.util.ChangeRunner
 import org.radarbase.android.util.SafeHandler
 import org.radarbase.android.util.StageLevels
 import org.radarbase.android.util.send
+import org.radarbase.passive.google.places.GooglePlacesManager.Companion.DEVICE_LOCATION_ACCURACY
+import org.radarbase.passive.google.places.GooglePlacesManager.Companion.DEVICE_LOCATION_CHANGED
 import org.radarbase.passive.phone.PhoneLocationService.Companion.LOCATION_GPS_INTERVAL_DEFAULT
 import org.radarbase.passive.phone.PhoneLocationService.Companion.LOCATION_GPS_INTERVAL_REDUCED_DEFAULT
 import org.radarbase.passive.phone.PhoneLocationService.Companion.LOCATION_NETWORK_INTERVAL_DEFAULT
@@ -104,7 +106,7 @@ class PhoneLocationManager(context: PhoneLocationService) : AbstractSourceManage
         handler.start()
 
         status = SourceStatusListener.Status.READY
-        broadcaster = LocalBroadcastManager.getInstance(this)
+        broadcaster = LocalBroadcastManager.getInstance(service)
 
         handler.execute {
             isStarted = true
@@ -140,7 +142,9 @@ class PhoneLocationManager(context: PhoneLocationService) : AbstractSourceManage
                 altitude?.normalize(), accuracy?.normalize(), speed?.normalize(), bearing?.normalize())
         send(locationTopic, value)
 
-        broadcaster.send(DEVICE_LOCATION_CHANGED)
+        broadcaster.send(DEVICE_LOCATION_CHANGED) {
+            accuracy?.let{ putExtra(DEVICE_LOCATION_ACCURACY, it) }
+        }
         logger.info("Location: {} {} {} {} {} {} {} {} {}", provider, eventTimestamp, latitude,
                 longitude, accuracy, altitude, speed, bearing, timestamp)
     }