spotny-sdk 1.0.33 → 1.0.35

package/android/src/main/java/com/spotnysdk/SpotnySdkModule.kt

@@ -111,7 +111,22 @@ class SpotnySdkModule(private val reactContext: ReactApplicationContext) :
 
   private fun setupBeaconManager() {
     BeaconManager.setDebug(false)
-    beaconManager.beaconParsers.add(BeaconParser().setBeaconLayout(IBEACON_LAYOUT))
+    beaconManager.setEnableScheduledScanJobs(false)
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+      val channelId = "spotny_sdk_channel"
+      val notifManager = reactContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+      val channel = NotificationChannel(channelId, "Spotny SDK", NotificationManager.IMPORTANCE_LOW)
+      notifManager.createNotificationChannel(channel)
+    }
+    val notification = NotificationCompat.Builder(reactContext, "spotny_sdk_channel")
+      .setSmallIcon(reactContext.applicationInfo.icon.takeIf { it != 0 } ?: android.R.drawable.ic_dialog_info)
+      .setContentTitle("Spotny")
+      .setContentText("Scanning for nearby beacons…")
+      .build()
+    beaconManager.enableForegroundServiceScanning(notification, 8765)
+    if (beaconManager.beaconParsers.isEmpty()) {
+      beaconManager.beaconParsers.add(BeaconParser().setBeaconLayout(IBEACON_LAYOUT))
+    }
     beaconManager.foregroundScanPeriod = 1_100L
     beaconManager.foregroundBetweenScanPeriod = 0L
     beaconManager.backgroundScanPeriod = 10_000L
@@ -152,8 +167,9 @@ class SpotnySdkModule(private val reactContext: ReactApplicationContext) :
     try {
       beaconManager.removeAllMonitorNotifiers()
       beaconManager.removeAllRangeNotifiers()
-      beaconManager.stopRangingBeaconsInRegion(Region("SpotnySDK_General", null, null, null))
-      beaconManager.stopMonitoringBeaconsInRegion(Region("SpotnySDK_General", null, null, null))
+      val region = Region("SpotnySDK_General", Identifier.parse(BEACON_UUID), null, null)
+      beaconManager.stopRangingBeaconsInRegion(region)
+      beaconManager.stopMonitoringBeaconsInRegion(region)
     } catch (_: RemoteException) {}
 
     cleanupAllState()
@@ -169,12 +185,13 @@ class SpotnySdkModule(private val reactContext: ReactApplicationContext) :
   override fun isScanning(promise: Promise) = promise.resolve(scanning)
 
   override fun initialize(config: ReadableMap?, promise: Promise) {
-    config?.getDouble("maxDetectionDistance").takeIf { config?.hasKey("maxDetectionDistance") == true }
-      ?.let { maxDetectionDistance = it; Log.d(TAG, "maxDetectionDistance = $it m") }
+    if (config?.hasKey("maxDetectionDistance") == true)
+      config.getDouble("maxDetectionDistance").let { maxDetectionDistance = it; Log.d(TAG, "maxDetectionDistance = $it m") }
     config?.getString("apiKey")?.let { apiKey = it; Log.d(TAG, "apiKey = $it") }
-    config?.getDouble("distanceCorrectionFactor")
-      .takeIf { config?.hasKey("distanceCorrectionFactor") == true && (it ?: 0.0) > 0 }
-      ?.let { distanceCorrectionFactor = it; Log.d(TAG, "distanceCorrectionFactor = $it") }
+    if (config?.hasKey("distanceCorrectionFactor") == true) {
+      val factor = config.getDouble("distanceCorrectionFactor")
+      if (factor > 0) { distanceCorrectionFactor = factor; Log.d(TAG, "distanceCorrectionFactor = $factor") }
+    }
     if (config?.hasKey("debug") == true) {
       debugMode = config.getBoolean("debug")
       Log.d(TAG, "debugMode = $debugMode")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spotny-sdk",
-  "version": "1.0.33",
+  "version": "1.0.35",
   "description": "Beacon Scanner",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",