expo-flic2 0.3.0 → 0.3.2

package/android/build/.transforms/62bfdea1d2792e3c919549d30b412f00/results.bin

@@ -0,0 +1 @@
+o/bundleLibRuntimeToDirDebug

package/android/build/.transforms/65c4cccd8d2440dd65bfb89bcb7c6d05/results.bin

@@ -0,0 +1 @@
+o/classes

package/android/build/generated/source/buildConfig/debug/expo/modules/flic2/BuildConfig.java

@@ -0,0 +1,10 @@
+/**
+ * Automatically generated file. DO NOT MODIFY
+ */
+package expo.modules.flic2;
+
+public final class BuildConfig {
+  public static final boolean DEBUG = Boolean.parseBoolean("true");
+  public static final String LIBRARY_PACKAGE_NAME = "expo.modules.flic2";
+  public static final String BUILD_TYPE = "debug";
+}

package/android/build/intermediates/aapt_friendly_merged_manifests/debug/processDebugManifest/aapt/AndroidManifest.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="expo.modules.flic2" >
+
+    <uses-sdk android:minSdkVersion="24" />
+
+</manifest>

package/android/build/intermediates/aapt_friendly_merged_manifests/debug/processDebugManifest/aapt/output-metadata.json

@@ -0,0 +1,18 @@
+{
+  "version": 3,
+  "artifactType": {
+    "type": "AAPT_FRIENDLY_MERGED_MANIFESTS",
+    "kind": "Directory"
+  },
+  "applicationId": "expo.modules.flic2",
+  "variantName": "debug",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "attributes": [],
+      "outputFile": "AndroidManifest.xml"
+    }
+  ],
+  "elementType": "File"
+}

package/android/build/intermediates/aar_metadata/debug/writeDebugAarMetadata/aar-metadata.properties

@@ -0,0 +1,6 @@
+aarFormatVersion=1.0
+aarMetadataVersion=1.0
+minCompileSdk=1
+minCompileSdkExtension=0
+minAndroidGradlePluginVersion=1.0.0
+coreLibraryDesugaringEnabled=false

package/android/build/intermediates/annotation_processor_list/debug/javaPreCompileDebug/annotationProcessors.json

@@ -0,0 +1 @@
+{}

package/android/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties

@@ -0,0 +1 @@
+#Tue Mar 17 22:01:08 EET 2026

package/android/build/intermediates/incremental/debug/packageDebugResources/merger.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/ziller321/work/kuori/fingridshellnative/node_modules/expo-flic2/android/src/main/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/ziller321/work/kuori/fingridshellnative/node_modules/expo-flic2/android/src/main/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/ziller321/work/kuori/fingridshellnative/node_modules/expo-flic2/android/src/debug/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/ziller321/work/kuori/fingridshellnative/node_modules/expo-flic2/android/src/debug/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/ziller321/work/kuori/fingridshellnative/node_modules/expo-flic2/android/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/ziller321/work/kuori/fingridshellnative/node_modules/expo-flic2/android/build/generated/res/resValues/debug"/></dataSet><mergedItems/></merger>

package/android/build/intermediates/incremental/mergeDebugAssets/merger.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/ziller321/code/expo-flic2/android/src/main/assets"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/ziller321/code/expo-flic2/android/src/debug/assets"/></dataSet><dataSet config="generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/ziller321/code/expo-flic2/android/build/intermediates/shader_assets/debug/compileDebugShaders/out"/></dataSet></merger>

package/android/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/ziller321/code/expo-flic2/android/src/main/jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/ziller321/code/expo-flic2/android/src/debug/jniLibs"/></dataSet></merger>

package/android/build/intermediates/incremental/mergeDebugShaders/merger.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/ziller321/code/expo-flic2/android/src/main/shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/ziller321/code/expo-flic2/android/src/debug/shaders"/></dataSet></merger>

package/android/build/intermediates/local_only_symbol_list/debug/parseDebugLocalResources/R-def.txt

@@ -0,0 +1,2 @@
+R_DEF: Internal format may change without notice
+local

package/android/build/intermediates/manifest_merge_blame_file/debug/processDebugManifest/manifest-merger-blame-debug-report.txt

@@ -0,0 +1,7 @@
+1<?xml version="1.0" encoding="utf-8"?>
+2<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+3    package="expo.modules.flic2" >
+4
+5    <uses-sdk android:minSdkVersion="24" />
+6
+7</manifest>

package/android/build/intermediates/merged_manifest/debug/processDebugManifest/AndroidManifest.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="expo.modules.flic2" >
+
+    <uses-sdk android:minSdkVersion="24" />
+
+</manifest>

package/android/build/intermediates/navigation_json/debug/extractDeepLinksDebug/navigation.json

@@ -0,0 +1 @@
+[]

package/android/build/intermediates/nested_resources_validation_report/debug/generateDebugResources/nestedResourcesValidationReport.txt

@@ -0,0 +1 @@
+0 Warning/Error

package/android/build/intermediates/symbol_list_with_package_name/debug/generateDebugRFile/package-aware-r.txt

@@ -0,0 +1 @@
+expo.modules.flic2

package/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/counters.tab

@@ -0,0 +1,2 @@
+2
+0

package/android/build/outputs/logs/manifest-merger-debug-report.txt

@@ -0,0 +1,16 @@
+-- Merging decision tree log ---
+manifest
+ADDED from /Users/ziller321/work/kuori/fingridshellnative/node_modules/expo-flic2/android/src/main/AndroidManifest.xml:1:1-2:12
+INJECTED from /Users/ziller321/work/kuori/fingridshellnative/node_modules/expo-flic2/android/src/main/AndroidManifest.xml:1:1-2:12
+	package
+		INJECTED from /Users/ziller321/work/kuori/fingridshellnative/node_modules/expo-flic2/android/src/main/AndroidManifest.xml
+	xmlns:android
+		ADDED from /Users/ziller321/work/kuori/fingridshellnative/node_modules/expo-flic2/android/src/main/AndroidManifest.xml:1:11-69
+uses-sdk
+INJECTED from /Users/ziller321/work/kuori/fingridshellnative/node_modules/expo-flic2/android/src/main/AndroidManifest.xml reason: use-sdk injection requested
+INJECTED from /Users/ziller321/work/kuori/fingridshellnative/node_modules/expo-flic2/android/src/main/AndroidManifest.xml
+INJECTED from /Users/ziller321/work/kuori/fingridshellnative/node_modules/expo-flic2/android/src/main/AndroidManifest.xml
+	android:targetSdkVersion
+		INJECTED from /Users/ziller321/work/kuori/fingridshellnative/node_modules/expo-flic2/android/src/main/AndroidManifest.xml
+	android:minSdkVersion
+		INJECTED from /Users/ziller321/work/kuori/fingridshellnative/node_modules/expo-flic2/android/src/main/AndroidManifest.xml

package/android/build.gradle

@@ -4,14 +4,14 @@ plugins {
 }
 
 group = 'expo.modules.flic2'
-version = '0.3.0'
+version = '0.3.2'
 
 android {
   namespace "expo.modules.flic2"
 
   defaultConfig {
     versionCode 1
-    versionName "0.3.0"
+    versionName "0.3.2"
     minSdkVersion 24
   }
 
@@ -32,4 +32,5 @@ repositories {
 
 dependencies {
   implementation 'com.github.50ButtonsEach:flic2lib-android:2.0.1'
+  testImplementation 'junit:junit:4.13.2'
 }

package/android/src/main/java/expo/modules/flic2/AgeCalculator.kt

@@ -0,0 +1,28 @@
+package expo.modules.flic2
+
+/**
+ * Translates a Flic2 button event timestamp into an age (ms since the physical press).
+ *
+ * The Flic2 SDK provides timestamps in milliseconds since the *button's own boot*, which is
+ * unrelated to Android's clocks. To convert, we establish a correlation at onReady time:
+ * we record both the button's readyTimestamp and Android's SystemClock.elapsedRealtime()
+ * at the same moment, then use that offset for all subsequent events.
+ */
+object AgeCalculator {
+    /**
+     * @param nowElapsedMs          SystemClock.elapsedRealtime() at the moment of processing
+     * @param androidReadyElapsedMs SystemClock.elapsedRealtime() recorded when onReady fired
+     * @param buttonReadyTimestamp  button's readyTimestamp (ms since button boot) from onReady
+     * @param eventTimestamp        button's event timestamp (ms since button boot)
+     * @return age in milliseconds, clamped to 0 (never negative)
+     */
+    fun computeAgeMs(
+        nowElapsedMs: Long,
+        androidReadyElapsedMs: Long,
+        buttonReadyTimestamp: Long,
+        eventTimestamp: Long
+    ): Long {
+        val estimatedAndroidEventTime = androidReadyElapsedMs + (eventTimestamp - buttonReadyTimestamp)
+        return maxOf(0L, nowElapsedMs - estimatedAndroidEventTime)
+    }
+}

package/android/src/main/java/expo/modules/flic2/ExpoFlic2Module.kt

@@ -2,6 +2,7 @@ package expo.modules.flic2
 
 import android.os.Handler
 import android.os.Looper
+import android.os.SystemClock
 import expo.modules.kotlin.modules.Module
 import expo.modules.kotlin.modules.ModuleDefinition
 import io.flic.flic2libandroid.Flic2Button
@@ -16,6 +17,9 @@ class ExpoFlic2Module : Module() {
   private var manager: Flic2Manager? = null
   private val triggerModes = ConcurrentHashMap<String, String>()
   private val buttonListeners = mutableMapOf<String, Flic2ButtonListener>()
+  // Correlation between button clock and Android clock, established at onReady.
+  // Maps uuid -> Pair(androidReadyElapsedMs, buttonReadyTimestampMs)
+  private val readyCorrelations = ConcurrentHashMap<String, Pair<Long, Long>>()
 
   override fun definition() = ModuleDefinition {
     Name("ExpoFlic2")
@@ -37,6 +41,7 @@ class ExpoFlic2Module : Module() {
       }
       buttonListeners.clear()
       triggerModes.clear()
+      readyCorrelations.clear()
     }
 
     Function("initialize") {
@@ -114,6 +119,11 @@ class ExpoFlic2Module : Module() {
     }
   }
 
+  private fun ageMs(uuid: String, eventTimestamp: Long): Long {
+    val (androidReadyMs, buttonReadyMs) = readyCorrelations[uuid] ?: return 0L
+    return AgeCalculator.computeAgeMs(SystemClock.elapsedRealtime(), androidReadyMs, buttonReadyMs, eventTimestamp)
+  }
+
   private fun findButton(uuid: String): Flic2Button? {
     return manager?.getButtons()?.find { it.uuid == uuid }
   }
@@ -137,12 +147,12 @@ class ExpoFlic2Module : Module() {
       ) {
         val mode = triggerModes[button.uuid] ?: "clickAndDoubleClickAndHold"
         if (mode != "click" && mode != "clickAndHold") return
-        val ageSeconds = (System.currentTimeMillis() - timestamp) / 1000
+        val age = ageMs(button.uuid, timestamp)
         if (isClick) {
-          sendEvent("onFlic2Click", mapOf("uuid" to button.uuid, "queued" to wasQueued, "age" to ageSeconds))
+          sendEvent("onFlic2Click", mapOf("uuid" to button.uuid, "queued" to wasQueued, "age" to age))
         }
         if (isHold && mode == "clickAndHold") {
-          sendEvent("onFlic2Hold", mapOf("uuid" to button.uuid, "queued" to wasQueued, "age" to ageSeconds))
+          sendEvent("onFlic2Hold", mapOf("uuid" to button.uuid, "queued" to wasQueued, "age" to age))
         }
       }
 
@@ -157,7 +167,7 @@ class ExpoFlic2Module : Module() {
       ) {
         val mode = triggerModes[button.uuid] ?: "clickAndDoubleClickAndHold"
         if (mode == "click" || mode == "clickAndHold") return
-        val ageSeconds = (System.currentTimeMillis() - timestamp) / 1000
+        val age = ageMs(button.uuid, timestamp)
         val emitClick = isSingleClick && mode != "clickAndDoubleClick"
         val emitDoubleClick = isDoubleClick
         val emitHold = isHold && mode != "clickAndDoubleClick"
@@ -165,21 +175,21 @@ class ExpoFlic2Module : Module() {
           sendEvent("onFlic2Click", mapOf(
             "uuid" to button.uuid,
             "queued" to wasQueued,
-            "age" to ageSeconds
+            "age" to age
           ))
         }
         if (emitDoubleClick) {
           sendEvent("onFlic2DoubleClick", mapOf(
             "uuid" to button.uuid,
             "queued" to wasQueued,
-            "age" to ageSeconds
+            "age" to age
           ))
         }
         if (emitHold) {
           sendEvent("onFlic2Hold", mapOf(
             "uuid" to button.uuid,
             "queued" to wasQueued,
-            "age" to ageSeconds
+            "age" to age
           ))
         }
       }
@@ -196,7 +206,7 @@ class ExpoFlic2Module : Module() {
           "uuid" to button.uuid,
           "isDown" to isDown,
           "queued" to wasQueued,
-          "age" to ((System.currentTimeMillis() - timestamp) / 1000)
+          "age" to ageMs(button.uuid, timestamp)
         ))
       }
 
@@ -208,6 +218,7 @@ class ExpoFlic2Module : Module() {
       }
 
       override fun onReady(button: Flic2Button, timestamp: Long) {
+        readyCorrelations[button.uuid] = Pair(SystemClock.elapsedRealtime(), timestamp)
         sendEvent("onFlic2Connection", mapOf(
           "uuid" to button.uuid,
           "state" to "ready"

package/android/src/test/java/expo/modules/flic2/AgeCalculatorTest.kt

@@ -0,0 +1,68 @@
+package expo.modules.flic2
+
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class AgeCalculatorTest {
+
+    // Scenario: button has been running for 10_000ms since its own boot.
+    // Android has been running for 5_000ms since its own boot.
+    // onReady fired when button reported 10_000ms and Android was at 5_000ms.
+
+    private val androidReady = 5_000L
+    private val buttonReady = 10_000L
+
+    @Test
+    fun `fresh press arrives with near-zero latency`() {
+        // Button pressed at button-time 10_050ms (50ms after ready).
+        // Android receives the event at android-time 5_080ms (80ms after ready).
+        // Expected age = 80 - 50 = 30ms.
+        val age = AgeCalculator.computeAgeMs(
+            nowElapsedMs = 5_080L,
+            androidReadyElapsedMs = androidReady,
+            buttonReadyTimestamp = buttonReady,
+            eventTimestamp = 10_050L
+        )
+        assertEquals(30L, age)
+    }
+
+    @Test
+    fun `queued press that happened 5 seconds before button connected`() {
+        // Button pressed at button-time 5_000ms (5_000ms before ready at 10_000ms).
+        // Android receives at android-time 5_100ms (100ms after ready).
+        // Expected age = 5_100 - (5_000 + (5_000 - 10_000)) = 5_100 - 0 = 5_100ms.
+        val age = AgeCalculator.computeAgeMs(
+            nowElapsedMs = 5_100L,
+            androidReadyElapsedMs = androidReady,
+            buttonReadyTimestamp = buttonReady,
+            eventTimestamp = 5_000L
+        )
+        assertEquals(5_100L, age)
+    }
+
+    @Test
+    fun `age is clamped to zero when button clock is slightly ahead of android clock`() {
+        // eventTimestamp slightly ahead of ready (clock drift), should not go negative.
+        val age = AgeCalculator.computeAgeMs(
+            nowElapsedMs = 5_000L,
+            androidReadyElapsedMs = androidReady,
+            buttonReadyTimestamp = buttonReady,
+            eventTimestamp = 10_020L  // 20ms into the future relative to now
+        )
+        assertEquals(0L, age)
+    }
+
+    @Test
+    fun `age is zero when event happens exactly now`() {
+        // Button pressed at button-time 10_200ms (200ms after ready).
+        // Android receives at android-time 5_200ms (200ms after ready).
+        // Perfectly synchronised clocks => age = 0.
+        val age = AgeCalculator.computeAgeMs(
+            nowElapsedMs = 5_200L,
+            androidReadyElapsedMs = androidReady,
+            buttonReadyTimestamp = buttonReady,
+            eventTimestamp = 10_200L
+        )
+        assertEquals(0L, age)
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-flic2",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "Expo module for Flic2 Bluetooth buttons",
   "main": "build/index.js",
   "types": "build/index.d.ts",