avoid ranging in background

radarlabs · Mar 3, 2023 · bea45c8 · bea45c8
1 parent 0e8686d
commit bea45c8
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 3 deletions.
diff --git a/sdk/build.gradle b/sdk/build.gradle
@@ -10,7 +10,7 @@ apply plugin: "org.jetbrains.dokka"
 apply plugin: 'io.radar.mvnpublish'
 
 ext {
-    radarVersion = '3.5.13-beta.7'
+    radarVersion = '3.5.13-beta.8'
 }
 
 String buildNumber = ".${System.currentTimeMillis()}"

diff --git a/sdk/src/main/java/io/radar/sdk/RadarApiClient.kt b/sdk/src/main/java/io/radar/sdk/RadarApiClient.kt
@@ -736,6 +736,7 @@ internal class RadarApiClient(
         queryParams.append("near=${location.latitude},${location.longitude}")
         queryParams.append("&radius=${radius}")
         queryParams.append("&limit=${limit}")
+        queryParams.append("&installId=${RadarSettings.getInstallId(context)}")
 
         val host = RadarSettings.getHost(context)
         val uri = Uri.parse(host).buildUpon()

diff --git a/sdk/src/main/java/io/radar/sdk/RadarBeaconManager.kt b/sdk/src/main/java/io/radar/sdk/RadarBeaconManager.kt
@@ -42,6 +42,10 @@ internal class RadarBeaconManager(
         private const val TIMEOUT_TOKEN = "timeout"
     }
 
+    internal fun getNearbyBeacons(): Array<RadarBeacon>? {
+        return nearbyBeacons.toTypedArray()
+    }
+
     private fun addCallback(callback: RadarBeaconCallback?) {
        if (callback == null) {
             return

diff --git a/sdk/src/main/java/io/radar/sdk/RadarLocationManager.kt b/sdk/src/main/java/io/radar/sdk/RadarLocationManager.kt
@@ -2,13 +2,11 @@ package io.radar.sdk
 
 import android.annotation.SuppressLint
 import android.app.NotificationManager
-import android.bluetooth.le.ScanResult
 import android.content.Context
 import android.content.Intent
 import android.location.Location
 import android.os.Build
 import io.radar.sdk.Radar.RadarLocationCallback
-import io.radar.sdk.Radar.RadarLocationServicesProvider.GOOGLE
 import io.radar.sdk.Radar.RadarLocationServicesProvider.HUAWEI
 import io.radar.sdk.Radar.RadarLocationSource
 import io.radar.sdk.Radar.RadarStatus
@@ -592,6 +590,7 @@ internal class RadarLocationManager(
             })
         }
 
+        /*
         if (options.beacons && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
             && permissionsHelper.bluetoothPermissionsGranted(context)) {
             Radar.apiClient.searchBeacons(location, 1000, 10, object : RadarApiClient.RadarSearchBeaconsApiCallback {
@@ -632,6 +631,37 @@ internal class RadarLocationManager(
         } else {
             callTrackApi(null)
         }
+         */
+
+        if (options.beacons && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
+            && permissionsHelper.bluetoothPermissionsGranted(context)) {
+            if (source != RadarLocationSource.BEACON_ENTER && source != RadarLocationSource.BEACON_EXIT && source != RadarLocationSource.MOCK_LOCATION && source != RadarLocationSource.MANUAL_LOCATION) {
+                Radar.apiClient.searchBeacons(
+                    location,
+                    1000,
+                    10,
+                    object : RadarApiClient.RadarSearchBeaconsApiCallback {
+                        override fun onComplete(
+                            status: RadarStatus,
+                            res: JSONObject?,
+                            beacons: Array<RadarBeacon>?,
+                            uuids: Array<String>?,
+                            uids: Array<String>?
+                        ) {
+                            if (!uuids.isNullOrEmpty() || !uids.isNullOrEmpty()) {
+                                Radar.beaconManager.startMonitoringBeaconUUIDs(uuids, uids)
+                            } else if (beacons != null) {
+                                Radar.beaconManager.startMonitoringBeacons(beacons)
+                            }
+                        }
+                    })
+            }
+
+            val beacons = Radar.beaconManager.getNearbyBeacons()
+            callTrackApi(beacons)
+        } else {
+            callTrackApi(null)
+        }
     }
 
     private fun startForegroundService(foregroundService: RadarTrackingOptions.RadarTrackingOptionsForegroundService) {