android: Fixes bluetoothStateChanged and initialize-call

Author: Lukangi

beacon_scanner_android/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.0.4
+
+* Fixes bluetoothStateChanged and initialize-call.
+
 ## 0.0.3+1
 
 * Fixes permission request.

beacon_scanner_android/android/src/main/kotlin/com/lukangagames/plugins/beaconscanner/BeaconScannerPlugin.kt

@@ -129,8 +129,9 @@ class BeaconScannerPlugin : FlutterPlugin, MethodCallHandler, ActivityAware, Req
                 if (beaconManager != null && !beaconManager!!.isBound(beaconScanner!!.beaconConsumer)) {
                     flutterResult = result
                     beaconManager!!.bind(beaconScanner!!.beaconConsumer)
+                } else {
+                    result.success(true)
                 }
-                result.success(true)
             }
 
             "initializeAndCheckScanning" -> initializeAndCheck(result)
@@ -269,11 +270,11 @@ class BeaconScannerPlugin : FlutterPlugin, MethodCallHandler, ActivityAware, Req
     }
 
     private val locationAuthorizationStatusStreamHandler: EventChannel.StreamHandler = object : EventChannel.StreamHandler {
-        override fun onListen(arguments: Any, events: EventSink) {
+        override fun onListen(arguments: Any?, events: EventSink) {
             eventSinkLocationAuthorizationStatus = events
         }
 
-        override fun onCancel(arguments: Any) {
+        override fun onCancel(arguments: Any?) {
             eventSinkLocationAuthorizationStatus = null
         }
     }

beacon_scanner_android/android/src/main/kotlin/com/lukangagames/plugins/beaconscanner/BeaconScannerService.kt

@@ -26,7 +26,7 @@ internal class BeaconScannerService(plugin: BeaconScannerPlugin, context: Contex
     private class MainThreadEventSink internal constructor(private val eventSink: EventSink) : EventSink {
         private val handler: Handler = Handler(Looper.getMainLooper())
 
-        override fun success(o: Any) {
+        override fun success(o: Any?) {
             handler.post { eventSink.success(o) }
         }
 
@@ -38,18 +38,18 @@ internal class BeaconScannerService(plugin: BeaconScannerPlugin, context: Contex
     }
 
     val rangingStreamHandler: EventChannel.StreamHandler = object : EventChannel.StreamHandler {
-        override fun onListen(o: Any, eventSink: EventSink) {
+        override fun onListen(o: Any?, eventSink: EventSink) {
             Log.d("RANGING", "Start ranging = $o")
             startRanging(o, eventSink)
         }
 
-        override fun onCancel(o: Any) {
+        override fun onCancel(o: Any?) {
             Log.d("RANGING", "Stop ranging = $o")
             stopRanging()
         }
     }
 
-    private fun startRanging(o: Any, eventSink: EventSink) {
+    private fun startRanging(o: Any?, eventSink: EventSink) {
         if (o is List<*>) {
             if (regionRanging == null) {
                 regionRanging = ArrayList()
@@ -118,16 +118,16 @@ internal class BeaconScannerService(plugin: BeaconScannerPlugin, context: Contex
         }
     }
     val monitoringStreamHandler: EventChannel.StreamHandler = object : EventChannel.StreamHandler {
-        override fun onListen(o: Any, eventSink: EventSink) {
+        override fun onListen(o: Any?, eventSink: EventSink) {
             startMonitoring(o, eventSink)
         }
 
-        override fun onCancel(o: Any) {
+        override fun onCancel(o: Any?) {
             stopMonitoring()
         }
     }
 
-    private fun startMonitoring(o: Any, eventSink: EventSink) {
+    private fun startMonitoring(o: Any?, eventSink: EventSink) {
         Log.d(TAG, "START MONITORING=$o")
         if (o is List<*>) {
             if (regionMonitoring == null) {

beacon_scanner_android/android/src/main/kotlin/com/lukangagames/plugins/beaconscanner/FlutterBluetoothStateReceiver.kt

@@ -32,7 +32,7 @@ internal class FlutterBluetoothStateReceiver(private val context: Context) : Bro
     }
 
     @SuppressLint("MissingPermission")
-    override fun onListen(o: Any, eventSink: EventSink) {
+    override fun onListen(o: Any?, eventSink: EventSink) {
         var state = BluetoothAdapter.STATE_OFF
         val bluetoothManager = context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager?
         if (bluetoothManager != null) {
@@ -47,7 +47,7 @@ internal class FlutterBluetoothStateReceiver(private val context: Context) : Bro
         context.registerReceiver(this, filter)
     }
 
-    override fun onCancel(o: Any) {
+    override fun onCancel(o: Any?) {
         context.unregisterReceiver(this)
     }
 }

beacon_scanner_android/pubspec.yaml

@@ -1,7 +1,7 @@
 name: beacon_scanner_android
 description: The Android implementation of beacon_scanner_platform_interface
 repository: https://github.com/Lukangi/beacon_scanner/tree/main/beacon_scanner_android
-version: 0.0.3+1
+version: 0.0.4
 
 environment:
   sdk: ">=2.18.0 <4.0.0"