react-native-flic2 2.0.0-alpha.39 → 2.0.0-beta.1

package/android/src/main/java/com/flic2/Flic2ButtonListener.kt

@@ -51,6 +51,8 @@ class Flic2ButtonEventListener(
         })
     }
 
+    // Android library calls ALL applicable callback methods, causing duplicate events.
+    // Only onButtonSingleOrDoubleClickOrHold should emit events to match iOS behavior.
     override fun onButtonClickOrHold(
         button: Flic2Button,
         wasQueued: Boolean,
@@ -59,13 +61,11 @@ class Flic2ButtonEventListener(
         isClick: Boolean,
         isHold: Boolean
     ) {
-        val event = if (isClick) "click" else "hold"
-        emitEvent(createButtonEvent(button, event).apply {
-            putBoolean("queued", wasQueued)
-            putDouble("age", System.currentTimeMillis() - timestamp.toDouble())
-        })
+        // Intentionally empty - events are handled by onButtonSingleOrDoubleClickOrHold
     }
 
+    // Android library calls ALL applicable callback methods, causing duplicate events.
+    // Only onButtonSingleOrDoubleClickOrHold should emit events to match iOS behavior.
     override fun onButtonSingleOrDoubleClick(
         button: Flic2Button,
         wasQueued: Boolean,
@@ -74,11 +74,7 @@ class Flic2ButtonEventListener(
         isSingleClick: Boolean,
         isDoubleClick: Boolean
     ) {
-        val event = if (isSingleClick) "click" else "doubleClick"
-        emitEvent(createButtonEvent(button, event).apply {
-            putBoolean("queued", wasQueued)
-            putDouble("age", System.currentTimeMillis() - timestamp.toDouble())
-        })
+        // Intentionally empty - events are handled by onButtonSingleOrDoubleClickOrHold
     }
 
     override fun onButtonSingleOrDoubleClickOrHold(

package/android/src/main/java/com/flic2/Flic2Module.kt

@@ -95,20 +95,6 @@ class Flic2Module(reactContext: ReactApplicationContext) :
     }
   }
 
-  // Example method - keep for reference
-  override fun multiply(a: Double, b: Double): Double {
-    val result = a * b
-
-    val eventData = Arguments.createMap().apply {
-      putDouble("a", a)
-      putDouble("b", b)
-      putDouble("result", result)
-    }
-    emitOnMultiply(eventData)
-
-    return result
-  }
-
   // MARK: - Manager Methods
 
   override fun initialize(background: Boolean, promise: Promise) {
@@ -172,46 +158,37 @@ class Flic2Module(reactContext: ReactApplicationContext) :
 
     Log.d(TAG, "Starting scan")
 
+    // Emit started event (matches iOS)
+    emitOnScanStatusChange(Arguments.createMap().apply {
+      putString("event", "started")
+      putString("eventName", "started")
+    })
+
     manager.startScan(object : Flic2ScanCallback {
       override fun onDiscoveredAlreadyPairedButton(button: Flic2Button) {
         Log.d(TAG, "Discovered already paired button")
-        emitOnScanStatusChange(Arguments.createMap().apply {
-          putInt("event", 0)
-          putString("eventName", "discovered")
-        })
       }
 
       override fun onDiscovered(bdAddr: String) {
         Log.d(TAG, "Discovered button: $bdAddr")
-        emitOnScanStatusChange(Arguments.createMap().apply {
-          putInt("event", 0)
-          putString("eventName", "discovered")
-        })
       }
 
       override fun onConnected() {
         Log.d(TAG, "Button connected during scan")
-        emitOnScanStatusChange(Arguments.createMap().apply {
-          putInt("event", 1)
-          putString("eventName", "connected")
-        })
       }
 
       override fun onComplete(result: Int, subCode: Int, button: Flic2Button?) {
         Log.d(TAG, "Scan complete: result=$result, button=${button?.uuid}")
 
-        if (result == Flic2ScanCallback.RESULT_SUCCESS && button != null) {
-          emitOnScanStatusChange(Arguments.createMap().apply {
-            putInt("event", 2)
-            putString("eventName", "verified")
-          })
+        val resultCode = mapScanResultToCode(result)
 
+        if (result == Flic2ScanCallback.RESULT_SUCCESS && button != null) {
           // Auto-connect (trigger mode not available in Android v1.1.0+)
           button.connect()
 
           setupButtonListener(button)
 
-          // Emit discovered event
+          // Emit discovered event as button event (like iOS)
           emitOnButtonEvent(Arguments.createMap().apply {
             putString("uuid", button.uuid)
             putString("event", "discovered")
@@ -221,6 +198,13 @@ class Flic2Module(reactContext: ReactApplicationContext) :
           val errorCode = Flic2Converter.scanResultToString(result)
           Log.e(TAG, "Scan failed with error code: $errorCode")
         }
+
+        // Emit scan completion with result code
+        emitOnScanStatusChange(Arguments.createMap().apply {
+          putString("event", "completion")
+          putString("eventName", "completion")
+          putInt("result", resultCode)
+        })
       }
     })
 
@@ -477,4 +461,21 @@ class Flic2Module(reactContext: ReactApplicationContext) :
     // Store listener reference
     buttonListeners[button.uuid] = listener
   }
+
+  private fun mapScanResultToCode(result: Int): Int {
+    // Map Android library's 9 result codes (0-8) to TypeScript enum codes (0-21) matching iOS
+    // Android library only provides these constants, so we map them to the closest equivalent
+    return when (result) {
+      Flic2ScanCallback.RESULT_SUCCESS -> 0 // SUCCESS
+      Flic2ScanCallback.RESULT_FAILED_ALREADY_RUNNING -> 1 // ALREADY_RUNNING
+      Flic2ScanCallback.RESULT_FAILED_BLUETOOTH_OFF -> 2 // BLUETOOTH_NOT_ACTIVATED
+      Flic2ScanCallback.RESULT_FAILED_SCAN_ERROR -> 3 // UNKNOWN
+      Flic2ScanCallback.RESULT_FAILED_NO_NEW_BUTTONS_FOUND -> 4 // NO_PUBLIC_BUTTON_DISCOVERED
+      Flic2ScanCallback.RESULT_FAILED_BUTTON_ALREADY_CONNECTED_TO_OTHER_DEVICE -> 5 // ALREADY_CONNECTED_TO_ANOTHER_DEVICE
+      Flic2ScanCallback.RESULT_FAILED_CONNECT_TIMED_OUT -> 6 // CONNECTION_TIMEOUT
+      Flic2ScanCallback.RESULT_FAILED_VERIFY_TIMED_OUT -> 7 // INVALID_VERIFIER
+      Flic2ScanCallback.RESULT_SYSTEM_PAIRING_DIALOG_NOT_ACCEPTED -> 9 // BLE_PAIRING_FAILED_USER_CANCELED
+      else -> 3 // UNKNOWN (for any unexpected codes)
+    }
+  }
 }

package/ios/Flic2.h

@@ -6,7 +6,6 @@
 
 @interface Flic2 : NativeFlic2SpecBase <NativeFlic2Spec, FLICManagerDelegate, FLICButtonDelegate>
 
-@property (nonatomic, strong) FLICManager *manager;
 @property (nonatomic, assign) BOOL managerRestored;
 
 @end