react-native-flic2 2.0.0-beta.2 → 2.0.0-beta.21

package/Flic2.podspec

@@ -13,10 +13,20 @@ Pod::Spec.new do |s|
   s.platforms    = { :ios => min_ios_version_supported }
   s.source       = { :git => "https://github.com/X-Guard/react-native-flic2.git", :tag => "#{s.version}" }
 
-  s.source_files = "ios/**/*.{h,m,mm,cpp}"
-  s.private_header_files = "ios/**/*.h"
+  install_modules_dependencies(s)
 
-  s.ios.vendored_frameworks = 'ios/flic2lib.framework'
+  # Keep the root spec codegen-only so consumers can opt into
+  # Device/Simulator implementations explicitly.
+  s.default_subspecs = []
 
-  install_modules_dependencies(s)
+  s.subspec "Device" do |sp|
+    sp.source_files = "ios/Flic2.{h,mm}"
+    sp.private_header_files = "ios/Flic2.h"
+    sp.ios.vendored_frameworks = "ios/flic2lib.framework"
+  end
+
+  s.subspec "Simulator" do |sp|
+    sp.source_files = "ios/Flic2SimulatorStub.{h,mm}"
+    sp.private_header_files = "ios/Flic2SimulatorStub.h"
+  end
 end

package/Flic2Device.podspec

@@ -0,0 +1,21 @@
+require "json"
+
+package = JSON.parse(File.read(File.join(__dir__, "package.json")))
+
+Pod::Spec.new do |s|
+  s.name         = "Flic2Device"
+  s.version      = package["version"]
+  s.summary      = package["description"]
+  s.homepage     = package["homepage"]
+  s.license      = package["license"]
+  s.authors      = package["author"]
+
+  s.platforms    = { :ios => min_ios_version_supported }
+  s.source       = { :git => "https://github.com/X-Guard/react-native-flic2.git", :tag => "#{s.version}" }
+
+  install_modules_dependencies(s)
+
+  s.source_files = "ios/Flic2.{h,mm}"
+  s.private_header_files = "ios/Flic2.h"
+  s.ios.vendored_frameworks = "ios/flic2lib.framework"
+end

package/Flic2Simulator.podspec

@@ -0,0 +1,20 @@
+require "json"
+
+package = JSON.parse(File.read(File.join(__dir__, "package.json")))
+
+Pod::Spec.new do |s|
+  s.name         = "Flic2Simulator"
+  s.version      = package["version"]
+  s.summary      = package["description"]
+  s.homepage     = package["homepage"]
+  s.license      = package["license"]
+  s.authors      = package["author"]
+
+  s.platforms    = { :ios => min_ios_version_supported }
+  s.source       = { :git => "https://github.com/X-Guard/react-native-flic2.git", :tag => "#{s.version}" }
+
+  install_modules_dependencies(s)
+
+  s.source_files = "ios/Flic2SimulatorStub.{h,mm}"
+  s.private_header_files = "ios/Flic2SimulatorStub.h"
+end

package/README.md

@@ -37,6 +37,15 @@ npm install react-native-flic2
    cd ios && pod install && cd ..
    ```
 
+   **Need simulator builds?**
+   See `Troubleshooting` -> `Running on iOS Simulator` for a full configuration
+   example and launch commands.
+
+   **Important (iOS pod wiring):**
+   The autolinked root `Flic2` pod is codegen-only in the 2.x beta setup.
+   To get a real iOS runtime implementation, add `Flic2Device` in your Podfile
+   (and `Flic2Simulator` for simulator-specific configurations).
+
 2. **Add Bluetooth permissions to `Info.plist`:**
    Add the following keys to your `ios/YourApp/Info.plist`:
    ```xml
@@ -66,6 +75,65 @@ The library automatically includes the necessary permissions in `AndroidManifest
 
 You'll need to request these permissions before scanning for buttons. Use a library like `react-native-permissions` or implement permission requests manually.
 
+#### Customizing the Foreground Service Notification (Android)
+
+The library runs a foreground service to keep Flic2 buttons connected in the background. You can customize the notification appearance by adding metadata to your app's `AndroidManifest.xml`:
+
+```xml
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application>
+        <!-- Your existing application configuration -->
+
+        <!-- Customize Flic2 foreground service notification -->
+        <meta-data
+            android:name="nl.xguard.flic2.notification_title"
+            android:value="My Flic2 Service" />
+        <meta-data
+            android:name="nl.xguard.flic2.notification_text"
+            android:value="Flic2 buttons are active" />
+        <meta-data
+            android:name="nl.xguard.flic2.notification_icon"
+            android:resource="@drawable/ic_notification" />
+        <meta-data
+            android:name="nl.xguard.flic2.notification_channel_name"
+            android:value="Flic2 Notifications" />
+        <meta-data
+            android:name="nl.xguard.flic2.notification_channel_description"
+            android:value="Notifications for Flic2 button connections" />
+        <meta-data
+            android:name="nl.xguard.flic2.notification_id"
+            android:value="123321" />
+        <meta-data
+            android:name="nl.xguard.flic2.notification_channel_id"
+            android:value="my_custom_channel_id" />
+    </application>
+</manifest>
+```
+
+**Available Configuration Options:**
+
+- `nl.xguard.flic2.notification_title` - Notification title (default: "Flic 2")
+- `nl.xguard.flic2.notification_text` - Notification text (default: "Flic 2 service is running")
+- `nl.xguard.flic2.notification_icon` - Notification icon resource ID (default: system info icon)
+  - Use `@drawable/your_icon_name` or `@mipmap/your_icon_name` format
+- `nl.xguard.flic2.notification_channel_name` - Notification channel name (default: "Flic2Channel")
+- `nl.xguard.flic2.notification_channel_description` - Notification channel description (default: "Flic2Channel")
+- `nl.xguard.flic2.notification_id` - Notification ID integer (default: 123321)
+- `nl.xguard.flic2.notification_channel_id` - Notification channel ID string (default: "Notification_Channel_Flic2Service")
+
+**Example with Custom Icon:**
+
+1. Add your notification icon to `android/app/src/main/res/drawable/` (e.g., `ic_flic2_notification.png`)
+
+2. Add metadata to `AndroidManifest.xml`:
+```xml
+<meta-data
+    android:name="nl.xguard.flic2.notification_icon"
+    android:resource="@drawable/ic_flic2_notification" />
+```
+
+**Note:** The notification icon must be a white/transparent icon suitable for Android notifications. If you don't specify a custom icon, the system default info icon will be used.
+
 ## Basic Usage
 
 ### 1. Initialize the Library (Global Setup)
@@ -390,7 +458,7 @@ export default Flic2Example;
 
 ### Initialization
 
-#### `initialize(): Promise<boolean>`
+#### `initialize(): Promise<void>`
 
 Initialize the Flic2 manager. This must be called before using any other methods.
 
@@ -400,7 +468,7 @@ await Flic2.initialize();
 
 ### Scanning
 
-#### `startScan(): Promise<{ success: boolean; message: string }>`
+#### `startScan(): Promise<void>`
 
 Start scanning for new Flic2 buttons. The scan will emit `scanStatusChange` events.
 
@@ -408,7 +476,7 @@ Start scanning for new Flic2 buttons. The scan will emit `scanStatusChange` even
 await Flic2.startScan();
 ```
 
-#### `stopScan(): Promise<{ success: boolean; message: string }>`
+#### `stopScan(): Promise<void>`
 
 Stop an ongoing scan.
 
@@ -442,7 +510,7 @@ Get a specific button by UUID.
 const button = await Flic2.getButton('button-uuid');
 ```
 
-#### `connectAllKnownButtons(): Promise<{ success: boolean; message: string }>`
+#### `connectAllKnownButtons(): Promise<void>`
 
 Connect to all previously known buttons.
 
@@ -450,7 +518,7 @@ Connect to all previously known buttons.
 await Flic2.connectAllKnownButtons();
 ```
 
-#### `disconnectAllKnownButtons(): Promise<{ success: boolean; message: string }>`
+#### `disconnectAllKnownButtons(): Promise<void>`
 
 Disconnect all connected buttons.
 
@@ -458,7 +526,7 @@ Disconnect all connected buttons.
 await Flic2.disconnectAllKnownButtons();
 ```
 
-#### `forgetButton(uuid: string): Promise<{ success: boolean; message: string }>`
+#### `forgetButton(uuid: string): Promise<void>`
 
 Forget (unpair) a specific button.
 
@@ -466,7 +534,7 @@ Forget (unpair) a specific button.
 await Flic2.forgetButton('button-uuid');
 ```
 
-#### `forgetAllButtons(): Promise<{ success: boolean; message: string }>`
+#### `forgetAllButtons(): Promise<void>`
 
 Forget all buttons.
 
@@ -476,50 +544,54 @@ await Flic2.forgetAllButtons();
 
 ### Button Configuration
 
-#### `buttonConnect(uuid: string): Promise<{ success: boolean; message: string }>`
+#### `buttonConnect(uuid: string): Promise<FlicButton>`
 
-Connect to a specific button.
+Connect to a specific button. Returns the button object.
 
 ```tsx
-await Flic2.buttonConnect('button-uuid');
+const button = await Flic2.buttonConnect('button-uuid');
 ```
 
-#### `buttonDisconnect(uuid: string): Promise<{ success: boolean; message: string }>`
+#### `buttonDisconnect(uuid: string): Promise<FlicButton>`
 
-Disconnect a specific button.
+Disconnect a specific button. Returns the button object.
 
 ```tsx
-await Flic2.buttonDisconnect('button-uuid');
+const button = await Flic2.buttonDisconnect('button-uuid');
 ```
 
-#### `buttonSetNickname(uuid: string, nickname: string): Promise<{ success: boolean; message: string }>`
+#### `buttonSetNickname(uuid: string, nickname: string): Promise<FlicButton>`
 
-Set a custom nickname for a button.
+Set a custom nickname for a button. Returns the updated button object.
 
 ```tsx
-await Flic2.buttonSetNickname('button-uuid', 'My Button');
+const button = await Flic2.buttonSetNickname('button-uuid', 'My Button');
 ```
 
-#### `buttonSetTriggerMode(uuid: string, mode: TriggerModeType): Promise<{ success: boolean; message: string }>`
+#### `buttonSetTriggerMode(uuid: string, mode: TriggerModeType): Promise<FlicButton>`
 
-Set the trigger mode for a button. Modes:
+Set the trigger mode for a button. Returns the updated button object. Modes:
 - `0`: Click and Hold
 - `1`: Click and Double Click
 - `2`: Click and Double Click and Hold
 - `3`: Click only
 
+**Note:** This method is only supported on iOS. On Android, it will reject with an error.
+
 ```tsx
-await Flic2.buttonSetTriggerMode('button-uuid', 3); // Click only
+const button = await Flic2.buttonSetTriggerMode('button-uuid', 3); // Click only
 ```
 
-#### `buttonSetLatencyMode(uuid: string, mode: LatencyModeType): Promise<{ success: boolean; message: string }>`
+#### `buttonSetLatencyMode(uuid: string, mode: LatencyModeType): Promise<FlicButton>`
 
-Set the latency mode for a button. Modes:
+Set the latency mode for a button. Returns the updated button object. Modes:
 - `0`: Normal latency
 - `1`: Low latency
 
+**Note:** This method is only supported on iOS. On Android, it will reject with an error.
+
 ```tsx
-await Flic2.buttonSetLatencyMode('button-uuid', 1); // Low latency
+const button = await Flic2.buttonSetLatencyMode('button-uuid', 1); // Low latency
 ```
 
 #### `getBatteryHealth(uuid: string): Promise<boolean>`
@@ -728,6 +800,52 @@ const scanForButtons = async () => {
 
 ## Troubleshooting
 
+### Running on iOS Simulator
+
+`flic2lib` is device-only. For simulator builds, use the no-op simulator pod and a
+dedicated simulator build configuration.
+
+1. Add a simulator configuration in Xcode (for example `DebugSimulator`) and a scheme that uses it.
+2. Map pods by configuration in your app `Podfile`:
+
+```ruby
+# Example
+project 'YourApp.xcodeproj', {
+  'Debug' => :debug,
+  'DebugSimulator' => :debug,
+  'Release' => :release,
+}
+
+target 'YourApp' do
+  # ... your existing use_react_native! setup
+
+  pod 'Flic2Device',
+    :path => '../node_modules/react-native-flic2',
+    :configurations => ['Debug', 'Release']
+
+  pod 'Flic2Simulator',
+    :path => '../node_modules/react-native-flic2',
+    :configurations => ['DebugSimulator']
+end
+```
+
+3. Install pods normally (no env flags):
+
+```sh
+cd ios && bundle exec pod install && cd ..
+```
+
+4. Launch simulator build (example):
+
+```sh
+npx react-native run-ios --scheme YourAppSimulator --mode DebugSimulator --simulator "iPhone 17"
+```
+
+Expected behavior on simulator:
+- App builds and launches.
+- Flic calls are no-op fallback behavior.
+- Real button communication works only on physical devices.
+
 ### Buttons not connecting
 
 - Ensure Bluetooth is enabled on the device

package/android/build.gradle

@@ -26,7 +26,7 @@ def getExtOrIntegerDefault(name) {
 }
 
 android {
-  namespace "com.flic2"
+  namespace "nl.xguard.flic2"
 
   compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
 

package/android/src/main/java/{com → nl/xguard}/flic2/ActivityUtil.kt

@@ -1,4 +1,4 @@
-package com.flic2
+package nl.xguard.flic2
 
 import android.app.ActivityManager
 import android.content.Context

package/android/src/main/java/{com → nl/xguard}/flic2/Flic2ButtonListener.kt

@@ -1,4 +1,4 @@
-package com.flic2
+package nl.xguard.flic2
 
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
@@ -47,7 +47,15 @@ class Flic2ButtonEventListener(
         val event = if (isDown) "buttonDown" else "buttonUp"
         emitEvent(createButtonEvent(button, event).apply {
             putBoolean("queued", wasQueued)
-            putDouble("age", System.currentTimeMillis() - timestamp.toDouble())
+            // Match old Android implementation and iOS:
+            // - Age is in seconds
+            // - Only meaningful for queued events; 0 for real-time events
+            val ageSeconds = if (wasQueued) {
+                (button.getReadyTimestamp() - timestamp) / 1000.0
+            } else {
+                0.0
+            }
+            putDouble("age", ageSeconds)
         })
     }
 
@@ -94,7 +102,15 @@ class Flic2ButtonEventListener(
         }
         emitEvent(createButtonEvent(button, event).apply {
             putBoolean("queued", wasQueued)
-            putDouble("age", System.currentTimeMillis() - timestamp.toDouble())
+            // Match old Android implementation and iOS:
+            // - Age is in seconds
+            // - Only meaningful for queued events; 0 for real-time events
+            val ageSeconds = if (wasQueued) {
+                (button.getReadyTimestamp() - timestamp) / 1000.0
+            } else {
+                0.0
+            }
+            putDouble("age", ageSeconds)
         })
     }
 

package/android/src/main/java/{com → nl/xguard}/flic2/Flic2Converter.kt

@@ -1,4 +1,4 @@
-package com.flic2
+package nl.xguard.flic2
 
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableArray
@@ -31,8 +31,7 @@ object Flic2Converter {
             putInt("firmwareRevision", button.getFirmwareVersion())
 
             // Check if ready by comparing connection state
-            val isReady = connState == Flic2Button.CONNECTION_STATE_CONNECTED_READY
-            putBoolean("isReady", isReady)
+            putBoolean("isReady", connState == Flic2Button.CONNECTION_STATE_CONNECTED_READY)
 
             // Get battery level from BatteryLevel object
             val batteryLevel = button.getLastKnownBatteryLevel()

package/android/src/main/java/{com → nl/xguard}/flic2/Flic2Module.kt

@@ -1,4 +1,4 @@
-package com.flic2
+package nl.xguard.flic2
 
 import android.content.ComponentName
 import android.content.Context
@@ -48,8 +48,7 @@ class Flic2Module(reactContext: ReactApplicationContext) :
   private val serviceConnection = object : ServiceConnection {
     override fun onServiceConnected(name: ComponentName?, service: IBinder?) {
       Log.d(TAG, "Service connected")
-      val binder = service as Flic2Service.Flic2ServiceBinder
-      flic2Service = binder.getService()
+      flic2Service = (service as Flic2Service.Flic2ServiceBinder).getService()
       serviceBound = true
 
       // Set up listeners for existing buttons
@@ -63,10 +62,7 @@ class Flic2Module(reactContext: ReactApplicationContext) :
 
       // Resolve the initialize promise if pending
       initializePromise?.let { promise ->
-        promise.resolve(Arguments.createMap().apply {
-          putBoolean("success", true)
-          putString("message", "Manager initialized successfully")
-        })
+        promise.resolve(null)
         initializePromise = null
       }
     }
@@ -90,6 +86,31 @@ class Flic2Module(reactContext: ReactApplicationContext) :
 
   override fun invalidate() {
     super.invalidate()
+
+    // Remove all button listeners before cleanup to prevent callbacks after teardown
+    try {
+      val manager = flic2Service?.getManager()
+      if (manager != null) {
+        buttonListeners.forEach { (uuid, listener) ->
+          try {
+            // Find the button and remove the listener
+            val button = manager.buttons.find { it.uuid == uuid }
+            if (button != null) {
+              button.removeListener(listener)
+              Log.d(TAG, "Removed listener for button during invalidate: $uuid")
+            }
+          } catch (e: Exception) {
+            Log.w(TAG, "Failed to remove listener for button during invalidate: $uuid", e)
+          }
+        }
+      }
+    } catch (e: Exception) {
+      Log.w(TAG, "Error during listener cleanup in invalidate", e)
+    }
+
+    // Clear listeners map
+    buttonListeners.clear()
+
     moduleScope.cancel()
     if (serviceBound) {
       reactApplicationContext.unbindService(serviceConnection)
@@ -107,8 +128,7 @@ class Flic2Module(reactContext: ReactApplicationContext) :
       val intent = Intent(reactApplicationContext, Flic2Service::class.java)
 
       // Check if service is already running
-      val isRunning = ActivityUtil.isServiceRunning(reactApplicationContext, Flic2Service::class.java)
-      if (!isRunning) {
+      if (!ActivityUtil.isServiceRunning(reactApplicationContext, Flic2Service::class.java)) {
         // Start service
         ActivityUtil.startForegroundService(reactApplicationContext, intent)
       }
@@ -182,8 +202,6 @@ class Flic2Module(reactContext: ReactApplicationContext) :
       override fun onComplete(result: Int, subCode: Int, button: Flic2Button?) {
         Log.d(TAG, "Scan complete: result=$result, button=${button?.uuid}")
 
-        val resultCode = mapScanResultToCode(result)
-
         if (result == Flic2ScanCallback.RESULT_SUCCESS && button != null) {
           // Auto-connect (trigger mode not available in Android v1.1.0+)
           button.connect()
@@ -202,24 +220,20 @@ class Flic2Module(reactContext: ReactApplicationContext) :
             putMap("button", Flic2Converter.buttonToMap(button))
           })
         } else {
-          val errorCode = Flic2Converter.scanResultToString(result)
-          Log.e(TAG, "Scan failed with error code: $errorCode")
+          Log.e(TAG, "Scan failed with error code: ${Flic2Converter.scanResultToString(result)}")
         }
 
         // Emit scan completion with result code
         emitOnScanStatusChange(Arguments.createMap().apply {
           putString("event", "completion")
           putString("eventName", "completion")
-          putInt("result", resultCode)
+          putInt("result", mapScanResultToCode(result))
         })
       }
     })
 
     // Return immediately - scan results will come through events
-    promise.resolve(Arguments.createMap().apply {
-      putBoolean("success", true)
-      putString("message", "Scan started")
-    })
+    promise.resolve(null)
   }
 
   override fun stopScan(promise: Promise) {
@@ -233,10 +247,7 @@ class Flic2Module(reactContext: ReactApplicationContext) :
       scanJob?.cancel()
       manager.stopScan()
 
-      promise.resolve(Arguments.createMap().apply {
-        putBoolean("success", true)
-        putString("message", "Scan stopped")
-      })
+      promise.resolve(null)
     } catch (e: Exception) {
       Log.e(TAG, "Failed to stop scan", e)
       promise.reject("STOP_SCAN_ERROR", "Failed to stop scan: ${e.message}", e)
@@ -260,7 +271,18 @@ class Flic2Module(reactContext: ReactApplicationContext) :
       // Disconnect before forgetting like iOS
       button.disconnectOrAbortPendingConnection()
 
-      // Remove listener
+      // Explicitly remove listener from button before forgetting (matches old implementation)
+      val listener = buttonListeners[uuid]
+      if (listener != null) {
+        try {
+          button.removeListener(listener)
+          Log.d(TAG, "Removed listener for button: $uuid")
+        } catch (e: Exception) {
+          Log.w(TAG, "Failed to remove listener for button: $uuid", e)
+        }
+      }
+
+      // Remove listener from map
       buttonListeners.remove(uuid)
 
       // Forget button
@@ -269,10 +291,7 @@ class Flic2Module(reactContext: ReactApplicationContext) :
       // Update foreground service state after removing button
       updateForegroundServiceState(manager.buttons.size)
 
-      promise.resolve(Arguments.createMap().apply {
-        putBoolean("success", true)
-        putString("message", "Button forgotten")
-      })
+      promise.resolve(null)
     } catch (e: Exception) {
       Log.e(TAG, "Failed to forget button", e)
       promise.reject("FORGET_ERROR", "Failed to forget button: ${e.message}", e)
@@ -291,10 +310,7 @@ class Flic2Module(reactContext: ReactApplicationContext) :
 
       button.connect()
 
-      promise.resolve(Arguments.createMap().apply {
-        putBoolean("success", true)
-        putString("message", "Connection initiated")
-      })
+      promise.resolve(Flic2Converter.buttonToMap(button))
     } catch (e: Exception) {
       Log.e(TAG, "Failed to connect button", e)
       promise.reject("CONNECT_ERROR", "Failed to connect: ${e.message}", e)
@@ -311,10 +327,7 @@ class Flic2Module(reactContext: ReactApplicationContext) :
 
       button.disconnectOrAbortPendingConnection()
 
-      promise.resolve(Arguments.createMap().apply {
-        putBoolean("success", true)
-        putString("message", "Disconnection initiated")
-      })
+      promise.resolve(Flic2Converter.buttonToMap(button))
     } catch (e: Exception) {
       Log.e(TAG, "Failed to disconnect button", e)
       promise.reject("DISCONNECT_ERROR", "Failed to disconnect: ${e.message}", e)
@@ -346,10 +359,7 @@ class Flic2Module(reactContext: ReactApplicationContext) :
       // v1.1.0 uses setName() method instead of property
       button.setName(nickname)
 
-      promise.resolve(Arguments.createMap().apply {
-        putBoolean("success", true)
-        putString("message", "Nickname set")
-      })
+      promise.resolve(Flic2Converter.buttonToMap(button))
     } catch (e: Exception) {
       Log.e(TAG, "Failed to set nickname", e)
       promise.reject("SET_NICKNAME_ERROR", "Failed to set nickname: ${e.message}", e)
@@ -372,10 +382,7 @@ class Flic2Module(reactContext: ReactApplicationContext) :
         button.connect()
       }
 
-      promise.resolve(Arguments.createMap().apply {
-        putBoolean("success", true)
-        putString("message", "All buttons connection initiated")
-      })
+      promise.resolve(null)
     } catch (e: Exception) {
       Log.e(TAG, "Failed to connect all buttons", e)
       promise.reject("CONNECT_ALL_ERROR", "Failed to connect all buttons: ${e.message}", e)
@@ -397,10 +404,7 @@ class Flic2Module(reactContext: ReactApplicationContext) :
         button.disconnectOrAbortPendingConnection()
       }
 
-      promise.resolve(Arguments.createMap().apply {
-        putBoolean("success", true)
-        putString("message", "All buttons disconnection initiated")
-      })
+      promise.resolve(null)
     } catch (e: Exception) {
       Log.e(TAG, "Failed to disconnect all buttons", e)
       promise.reject("DISCONNECT_ALL_ERROR", "Failed to disconnect all buttons: ${e.message}", e)
@@ -419,18 +423,31 @@ class Flic2Module(reactContext: ReactApplicationContext) :
       val buttons = manager.buttons.toList()
 
       buttons.forEach { button ->
+        // Explicitly remove listener from button before forgetting (matches old implementation)
+        val listener = buttonListeners[button.uuid]
+        if (listener != null) {
+          try {
+            button.removeListener(listener)
+            Log.d(TAG, "Removed listener for button: ${button.uuid}")
+          } catch (e: Exception) {
+            Log.w(TAG, "Failed to remove listener for button: ${button.uuid}", e)
+          }
+        }
+
+        // Remove listener from map
         buttonListeners.remove(button.uuid)
+
+        // Disconnect before forgetting
         button.disconnectOrAbortPendingConnection()
+
+        // Forget button
         manager.forgetButton(button)
       }
 
       // Update foreground service state after removing all buttons
       updateForegroundServiceState(manager.buttons.size)
 
-      promise.resolve(Arguments.createMap().apply {
-        putBoolean("success", true)
-        putString("message", "All buttons forgotten")
-      })
+      promise.resolve(null)
     } catch (e: Exception) {
       Log.e(TAG, "Failed to forget all buttons", e)
       promise.reject("FORGET_ALL_ERROR", "Failed to forget all buttons: ${e.message}", e)
@@ -445,8 +462,7 @@ class Flic2Module(reactContext: ReactApplicationContext) :
         return
       }
 
-      val scanning = (scanJob != null && scanJob?.isActive == true)
-      promise.resolve(scanning)
+      promise.resolve(scanJob != null && scanJob?.isActive == true)
     } catch (e: Exception) {
       Log.e(TAG, "Failed to check scanning status", e)
       promise.reject("IS_SCANNING_ERROR", "Failed to check scanning status: ${e.message}", e)
@@ -502,3 +518,4 @@ class Flic2Module(reactContext: ReactApplicationContext) :
     }
   }
 }
+

package/android/src/main/java/{com → nl/xguard}/flic2/Flic2Package.kt

@@ -1,4 +1,4 @@
-package com.flic2
+package nl.xguard.flic2
 
 import com.facebook.react.BaseReactPackage
 import com.facebook.react.bridge.NativeModule
@@ -31,3 +31,4 @@ class Flic2Package : BaseReactPackage() {
     }
   }
 }
+