react-native-polar-bridge 0.2.4 → 0.2.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/android/src/main/java/com/polarbridge/PolarBridgeModule.kt +20 -4
  2. package/ios/PolarBridge.swift +32 -16
  3. package/package.json +1 -1
package/android/src/main/java/com/polarbridge/PolarBridgeModule.kt CHANGED
@@ -626,7 +626,11 @@ class PolarBridgeModule(reactContext: ReactApplicationContext) :
626
626
 
627
627
  override fun fetchHrData(deviceId: String, ms: Double?) {
628
628
  Log.e(TAG, "Fetch Heart Data called on: $deviceId ")
629
- val bufferMs = ms?.toLong()?.takeIf { it >= 0 } ?: SENSOR_BUFFER_MS
629
+ val bufferMs: Long = if (ms != null && ms >= 0) {
630
+ ms.toLong()
631
+ } else {
632
+ SENSOR_BUFFER_MS
633
+ }
630
634
  val isDisposed = hrDisposable?.isDisposed ?: true
631
635
  try{
632
636
  if (isDisposed) {
@@ -733,7 +737,11 @@ class PolarBridgeModule(reactContext: ReactApplicationContext) :
733
737
 
734
738
  override fun fetchAccData(deviceId: String, ms: Double?) {
735
739
  Log.e(TAG, "Fetch Accelerometer Data called on: $deviceId ")
736
- val bufferMs = ms?.toLong()?.takeIf { it >= 0 } ?: SENSOR_BUFFER_MS
740
+ val bufferMs: Long = if (ms != null && ms >= 0) {
741
+ ms.toLong()
742
+ } else {
743
+ SENSOR_BUFFER_MS
744
+ }
737
745
  val isDisposed = accDisposable?.isDisposed ?: true
738
746
  try{
739
747
  if (isDisposed) {
@@ -790,7 +798,11 @@ class PolarBridgeModule(reactContext: ReactApplicationContext) :
790
798
 
791
799
  override fun fetchGyrData(deviceId: String, ms: Double?) {
792
800
  Log.e(TAG, "Fetch Gyroscope Data called on: $deviceId ")
793
- val bufferMs = ms?.toLong()?.takeIf { it >= 0 } ?: SENSOR_BUFFER_MS
801
+ val bufferMs: Long = if (ms != null && ms >= 0) {
802
+ ms.toLong()
803
+ } else {
804
+ SENSOR_BUFFER_MS
805
+ }
794
806
  val isDisposed = gyrDisposable?.isDisposed ?: true
795
807
  try {
796
808
  if (isDisposed) {
@@ -849,7 +861,11 @@ class PolarBridgeModule(reactContext: ReactApplicationContext) :
849
861
 
850
862
  override fun fetchPpgData(deviceId: String, ms: Double?) {
851
863
  Log.e(TAG, "Fetch Photoplethysmograph Data called on: $deviceId ")
852
- val bufferMs = ms?.toLong()?.takeIf { it >= 0 } ?: SENSOR_BUFFER_MS
864
+ val bufferMs: Long = if (ms != null && ms >= 0) {
865
+ ms.toLong()
866
+ } else {
867
+ SENSOR_BUFFER_MS
868
+ }
853
869
  val isDisposed = ppgDisposable?.isDisposed ?: true
854
870
  try {
855
871
  if (isDisposed) {
package/ios/PolarBridge.swift CHANGED
@@ -209,10 +209,14 @@ class PolarBridge: RCTEventEmitter, ObservableObject
209
209
 
210
210
  @objc(fetchHrData:bufferMs:)
211
211
  func fetchHrData(_ deviceId: String, bufferMs: NSNumber?) {
212
- NSLog("PolarBridge: Fetch HR Data called on: \(deviceId)")
213
- let resolvedBufferMs: TimeInterval = ((bufferMs as? NSNumber)?.doubleValue ?? -1) >= 0
214
- ? bufferMs!.doubleValue
215
- : SENSOR_BUFFER_MS
212
+ NSLog("PolarBridge: Fetch HR Data called on: \(deviceId) bufferMs: \(bufferMs)")
213
+ let resolvedBufferMs: TimeInterval
214
+
215
+ if let number = bufferMs, !(number is NSNull) {
216
+ resolvedBufferMs = number.doubleValue >= 0 ? number.doubleValue : SENSOR_BUFFER_MS
217
+ } else {
218
+ resolvedBufferMs = SENSOR_BUFFER_MS
219
+ }
216
220
  guard let api = api else {
217
221
  NSLog("PolarBridge: Polar API not initialized")
218
222
  return
@@ -342,10 +346,14 @@ class PolarBridge: RCTEventEmitter, ObservableObject
342
346
 
343
347
  @objc(fetchAccData:bufferMs:)
344
348
  func fetchAccData(_ deviceId: String, bufferMs: NSNumber?) {
345
- NSLog("PolarBridge: Fetch ACC Data called on: \(deviceId)")
346
- let resolvedBufferMs: TimeInterval = ((bufferMs as? NSNumber)?.doubleValue ?? -1) >= 0
347
- ? bufferMs!.doubleValue
348
- : SENSOR_BUFFER_MS
349
+ NSLog("PolarBridge: Fetch ACC Data called on: \(deviceId) bufferMs: \(bufferMs)")
350
+ let resolvedBufferMs: TimeInterval
351
+
352
+ if let number = bufferMs, !(number is NSNull) {
353
+ resolvedBufferMs = number.doubleValue >= 0 ? number.doubleValue : SENSOR_BUFFER_MS
354
+ } else {
355
+ resolvedBufferMs = SENSOR_BUFFER_MS
356
+ }
349
357
  guard let api = api else {
350
358
  NSLog("PolarBridge: Polar API not initialized")
351
359
  return
@@ -472,10 +480,14 @@ class PolarBridge: RCTEventEmitter, ObservableObject
472
480
 
473
481
  @objc(fetchGyrData:bufferMs:)
474
482
  func fetchGyrData(_ deviceId: String, bufferMs: NSNumber?) {
475
- NSLog("PolarBridge: Fetch Gyroscope Data called on: \(deviceId)")
476
- let resolvedBufferMs: TimeInterval = ((bufferMs as? NSNumber)?.doubleValue ?? -1) >= 0
477
- ? bufferMs!.doubleValue
478
- : SENSOR_BUFFER_MS
483
+ NSLog("PolarBridge: Fetch Gyroscope Data called on: \(deviceId) bufferMs: \(bufferMs)")
484
+ let resolvedBufferMs: TimeInterval
485
+
486
+ if let number = bufferMs, !(number is NSNull) {
487
+ resolvedBufferMs = number.doubleValue >= 0 ? number.doubleValue : SENSOR_BUFFER_MS
488
+ } else {
489
+ resolvedBufferMs = SENSOR_BUFFER_MS
490
+ }
479
491
  guard let api = api else {
480
492
  NSLog("PolarBridge: Polar API not initialized")
481
493
  return
@@ -608,10 +620,14 @@ class PolarBridge: RCTEventEmitter, ObservableObject
608
620
 
609
621
  @objc(fetchPpgData:bufferMs:)
610
622
  func fetchPpgData(_ deviceId: String, bufferMs: NSNumber?) {
611
- NSLog("PolarBridge: Fetch PPG Data called on: \(deviceId)")
612
- let resolvedBufferMs: TimeInterval = ((bufferMs as? NSNumber)?.doubleValue ?? -1) >= 0
613
- ? bufferMs!.doubleValue
614
- : SENSOR_BUFFER_MS
623
+ NSLog("PolarBridge: Fetch PPG Data called on: \(deviceId) bufferMs: \(bufferMs)")
624
+ let resolvedBufferMs: TimeInterval
625
+
626
+ if let number = bufferMs, !(number is NSNull) {
627
+ resolvedBufferMs = number.doubleValue >= 0 ? number.doubleValue : SENSOR_BUFFER_MS
628
+ } else {
629
+ resolvedBufferMs = SENSOR_BUFFER_MS
630
+ }
615
631
  guard let api = api else {
616
632
  NSLog("PolarBridge: Polar API not initialized")
617
633
  return
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "react-native-polar-bridge",
3
- "version": "0.2.4",
3
+ "version": "0.2.6",
4
4
  "description": "Polar SDK for React Native",
5
5
  "source": "./src/index.tsx",
6
6
  "main": "./lib/module/index.js",