react-native-polar-bridge 0.2.8 → 0.2.10

package/PolarBridge.podspec

@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   s.source_files = "ios/**/*.{h,m,mm,cpp,swift}"
   s.private_header_files = "ios/**/*.h"
 
-  s.dependency 'PolarBleSdk', '~> 6.4.0'
+  s.dependency 'PolarBleSdk', '~> 6.14.0'
 
 # Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.
 # See https://github.com/facebook/react-native/blob/febf6b7f33fdb4904669f99d795eba4c0f95d7bf/scripts/cocoapods/new_architecture.rb#L79.

package/android/build.gradle

@@ -93,7 +93,7 @@ dependencies {
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
   implementation 'io.reactivex.rxjava3:rxjava:3.1.11'
   implementation 'io.reactivex.rxjava3:rxandroid:3.0.2'
-  implementation 'com.github.polarofficial:polar-ble-sdk:6.4.0'
+  implementation 'com.github.polarofficial:polar-ble-sdk:6.14.0'
 }
 
 react {

package/android/gradle.properties

@@ -1,5 +1,5 @@
 PolarBridge_kotlinVersion=2.0.21
-PolarBridge_minSdkVersion=24
+PolarBridge_minSdkVersion=26
 PolarBridge_targetSdkVersion=34
 PolarBridge_compileSdkVersion=35
 PolarBridge_ndkVersion=27.1.12297006

package/android/src/main/java/com/polarbridge/PolarBridgeModule.kt

@@ -18,7 +18,7 @@ import io.reactivex.rxjava3.core.Single
 import java.util.*
 import java.util.concurrent.atomic.AtomicInteger
 import java.util.concurrent.TimeUnit
-import java.time.Instant
+import java.time.*
 
 @ReactModule(name = PolarBridgeModule.NAME)
 class PolarBridgeModule(reactContext: ReactApplicationContext) :
@@ -65,13 +65,13 @@ class PolarBridgeModule(reactContext: ReactApplicationContext) :
 
   override fun connectToDevice(deviceId: String, promise: Promise) {
     val map: WritableMap = Arguments.createMap()
-    var deviceConnected = false
-    var batteryReceived = false
+    var connectedId: String? = null
+    var battery: Int? = null
+    var isResolved = false // Guard to ensure we only resolve once
     api.setApiCallback(object : PolarBleApiCallback() {
       override fun deviceConnected(polarDeviceInfo: PolarDeviceInfo) {
         Log.d("Polar", "Connected: ${polarDeviceInfo.deviceId}")
-        map.putString("connectedDeviceId", polarDeviceInfo.deviceId)
-        deviceConnected = true
+        connectedId = polarDeviceInfo.deviceId
         runResolve()
       }
 
@@ -88,13 +88,14 @@ class PolarBridgeModule(reactContext: ReactApplicationContext) :
 
       override fun batteryLevelReceived(identifier: String, level: Int) {
         Log.d("Polar", "Battery for $identifier: $level%")
-        map.putInt("batteryLevel", level)
-        batteryReceived = true
+        battery = level
         runResolve()
       }
 
       private fun runResolve() {
-        if (deviceConnected && batteryReceived) {
+        if (connectedId != null && battery != null && !isResolved) {
+          map.putString("connectedDeviceId", connectedId)
+          map.putInt("batteryLevel", battery)
           promise.resolve(map)
         }
       }
@@ -210,7 +211,9 @@ class PolarBridgeModule(reactContext: ReactApplicationContext) :
             )
 
             val map: WritableMap = Arguments.createMap()
-            map.putDouble("recTimestamp", polarOfflineRecordingEntry.date.time.toDouble())
+            map.putDouble("recTimestamp", polarOfflineRecordingEntry.date
+              .toInstant(ZoneOffset.UTC)
+              .toEpochMilli().toDouble())
             map.putString("path", polarOfflineRecordingEntry.path)
             map.putDouble("size", polarOfflineRecordingEntry.size.toDouble())
             array.pushMap(map)
@@ -373,10 +376,14 @@ class PolarBridgeModule(reactContext: ReactApplicationContext) :
                   Log.d(TAG, "Recording ${polarOfflineRecordingEntry.path} downloaded. Size: ${polarOfflineRecordingEntry.size}")
                   when (it) {
                     is PolarOfflineRecordingData.HrOfflineRecording -> {
-                      Log.d(TAG, "HR Offline Recording started at ${it.startTime.time}")
+                      Log.d(TAG, "HR Offline Recording started at ${it.startTime
+                        .toInstant(ZoneOffset.UTC)
+                        .toEpochMilli()}")
                       var index = 0;
                       val intervalInMs = 1000; // 1Hz
-                      val firstSampleDateUTC = it.startTime.timeInMillis + intervalInMs
+                      val firstSampleDateUTC = it.startTime
+                        .toInstant(ZoneOffset.UTC)
+                        .toEpochMilli() + intervalInMs
                       for (sample in it.data.samples) {
                         val unixTimestamp = firstSampleDateUTC + intervalInMs * index++;
                         val timestamp = Instant.ofEpochMilli(unixTimestamp)
@@ -393,7 +400,8 @@ class PolarBridgeModule(reactContext: ReactApplicationContext) :
                       }
                     }
                     is PolarOfflineRecordingData.AccOfflineRecording -> {
-                      Log.d(TAG, "ACC Offline Recording started at ${it.startTime.time}")
+                      Log.d(TAG, "ACC Offline Recording started at ${it.startTime.toInstant(ZoneOffset.UTC)
+                        .toEpochMilli()}")
                       var index = 0;
                       for (sample in it.data.samples) {
                         Log.d(TAG, "ACC data: time: ${sample.timeStamp} X: ${sample.x} Y: ${sample.y} Z: ${sample.z} entry ${++index} of ${it.data.samples.size}")
@@ -409,7 +417,8 @@ class PolarBridgeModule(reactContext: ReactApplicationContext) :
                       }
                     }
                     is PolarOfflineRecordingData.GyroOfflineRecording -> {
-                      Log.d(TAG, "GYRO Offline Recording started at ${it.startTime.time}")
+                      Log.d(TAG, "GYRO Offline Recording started at ${it.startTime.toInstant(ZoneOffset.UTC)
+                        .toEpochMilli()}")
                       var index = 0;
                       for (sample in it.data.samples) {
                         Log.d(TAG, "GYRO data: ${sample.timeStamp} X: ${sample.x} Y: ${sample.y} Z: ${sample.z} entry ${++index} of ${it.data.samples.size}")
@@ -425,7 +434,8 @@ class PolarBridgeModule(reactContext: ReactApplicationContext) :
                       }
                     }
                     is PolarOfflineRecordingData.PpgOfflineRecording -> {
-                      Log.d(TAG, "PPG Offline Recording started at ${it.startTime.time}")
+                      Log.d(TAG, "PPG Offline Recording started at ${it.startTime.toInstant(ZoneOffset.UTC)
+                        .toEpochMilli()}")
                       var index = 0;
                       for (sample in it.data.samples) {
                         Log.d(TAG, "PPG data: ${sample.timeStamp} ppg0 ${sample.channelSamples[0]} ppg1 ${sample.channelSamples[1]} ppg2 ${sample.channelSamples[2]} ambient ${sample.channelSamples[3]} entry ${++index} of ${it.data.samples.size}")
@@ -505,15 +515,14 @@ class PolarBridgeModule(reactContext: ReactApplicationContext) :
 
   // Sets the date time on the Polar device
   override fun setDeviceTime(deviceId: String) {
-    val calendar = Calendar.getInstance()
-    calendar.time = Date()
-    Log.e(TAG, "Set device: $deviceId time to ${calendar.time}")
+    val now = LocalDateTime.now(ZoneOffset.UTC)
+    Log.e(TAG, "Set device: $deviceId time to ${now}")
     try {
-      api.setLocalTime(deviceId, calendar)
+      api.setLocalTime(deviceId, now)
         .observeOn(AndroidSchedulers.mainThread())
         .subscribe(
           {
-            val timeSetString = "time ${calendar.time} set to device"
+            val timeSetString = "time ${now} set to device"
             Log.d(TAG, timeSetString)
           },
           { error: Throwable -> Log.e(TAG, "set time failed: $error") }
@@ -529,13 +538,14 @@ class PolarBridgeModule(reactContext: ReactApplicationContext) :
       .observeOn(AndroidSchedulers.mainThread())
       .subscribe(
         { calendar ->
-          val timeGetString = "${calendar.time} read from the device"
+          val timeGetString = "${calendar} read from the device"
 
           val map: WritableMap = Arguments.createMap()
-          map.putString("time", "${calendar.time}")
+          map.putString("time", "${calendar.toInstant(ZoneOffset.UTC)}")
           // Long not supported, use double as workaround
           // See: https://github.com/facebook/react-native/issues/9685
-          map.putDouble("timeMs", calendar.timeInMillis.toDouble())
+          map.putDouble("timeMs", calendar.toInstant(ZoneOffset.UTC)
+            .toEpochMilli().toDouble())
           promise.resolve(map)
         },
         { error: Throwable ->
@@ -567,9 +577,6 @@ class PolarBridgeModule(reactContext: ReactApplicationContext) :
   }
 
   override fun doFactoryReset(deviceId: String) {
-    val calendar = Calendar.getInstance()
-    calendar.time = Date()
-    Log.e(TAG, "Set device: $deviceId time to ${calendar.time}")
     try {
       api.doFactoryReset(deviceId, preservePairingInformation = true)
         .observeOn(AndroidSchedulers.mainThread())

package/ios/PolarBridge.swift

@@ -132,7 +132,7 @@ class PolarBridge: RCTEventEmitter, ObservableObject
         let allSettings = api.requestFullStreamSettings(identifier, feature: feature)
             .catch { error in
                 NSLog("Full stream settings NOT available for \(feature). Reason: \(error.localizedDescription)")
-                return Single.just(PolarSensorSetting([:]))
+                return Single.just(try PolarSensorSetting([:]))
             }
 
         return Single.zip(availableSettings, allSettings)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-polar-bridge",
-  "version": "0.2.8",
+  "version": "0.2.10",
   "description": "Polar SDK for React Native",
   "source": "./src/index.tsx",
   "main": "./lib/module/index.js",