@tryvital/vital-health-react-native 1.12.0 → 1.13.1

package/android/build.gradle

@@ -130,7 +130,7 @@ repositories {
 }
 
 def kotlin_version = getExtOrDefault('kotlinVersion')
-def vital_sdk_version = '1.0.0-beta.18'
+def vital_sdk_version = '1.0.0-beta.21'
 def health_connect_version = '1.0.0-alpha11'
 
 dependencies {

package/android/src/main/java/com/vitalhealthreactnative/VitalHealthReactNativeModule.kt

@@ -111,7 +111,7 @@ class VitalHealthReactNativeModule(reactContext: ReactApplicationContext) :
     promise: Promise
   ) {
     val manager = vitalHealthConnectManager ?: return promise.rejectHealthNotConfigured()
-    if (askForPermission != null) {
+    if (synchronized(this) { this.askForPermission != null }) {
       return promise.reject(
         VITAL_HEALTH_ERROR,
         "Another ask for permission call is already in progress."
@@ -140,7 +140,9 @@ class VitalHealthReactNativeModule(reactContext: ReactApplicationContext) :
       readResources = read, writeResources = write
     )
 
-    askForPermission = AskForPermissionContinuation(contract, promise)
+    synchronized(this) {
+      askForPermission = AskForPermissionContinuation(contract, promise)
+    }
 
     val intent = contract.createIntent(reactApplicationContext, Unit)
     activity.startActivityForResult(intent, VITAL_REQUEST_CODE)
@@ -301,7 +303,7 @@ class VitalHealthReactNativeModule(reactContext: ReactApplicationContext) :
     // p1: request code
     // p2: result code
     if (p1 == VITAL_REQUEST_CODE) {
-      val continuation = askForPermission ?: return
+      val continuation = synchronized(this) { askForPermission } ?: return
 
       val resultAsync = continuation.contract.parseResult(p2, p3)
       val job = mainScope.launch {
@@ -312,6 +314,7 @@ class VitalHealthReactNativeModule(reactContext: ReactApplicationContext) :
         if (it != null) {
           continuation.promise.reject(VITAL_HEALTH_ERROR, "ask for permission has encountered an error", it)
         }
+        synchronized(this) { this.askForPermission = null }
       }
     }
   }

package/lib/commonjs/health_config.js

@@ -10,7 +10,7 @@ function _toPrimitive(input, hint) { if (typeof input !== "object" || input ===
 class HealthConfig {
   constructor() {
     _defineProperty(this, "logsEnabled", true);
-    _defineProperty(this, "numberOfDaysToBackFill", 90);
+    _defineProperty(this, "numberOfDaysToBackFill", 30);
     _defineProperty(this, "androidConfig", new AndroidHealthConfig());
     _defineProperty(this, "iOSConfig", new IOSHealthConfig());
   }

package/lib/module/health_config.js

@@ -4,7 +4,7 @@ function _toPrimitive(input, hint) { if (typeof input !== "object" || input ===
 export class HealthConfig {
   constructor() {
     _defineProperty(this, "logsEnabled", true);
-    _defineProperty(this, "numberOfDaysToBackFill", 90);
+    _defineProperty(this, "numberOfDaysToBackFill", 30);
     _defineProperty(this, "androidConfig", new AndroidHealthConfig());
     _defineProperty(this, "iOSConfig", new IOSHealthConfig());
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tryvital/vital-health-react-native",
-  "version": "1.12.0",
+  "version": "1.13.1",
   "description": "Client to access iOS's HealthKit and Android HealthConnect",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",

package/src/health_config.ts

@@ -1,6 +1,6 @@
 export class HealthConfig {
   logsEnabled = true;
-  numberOfDaysToBackFill = 90;
+  numberOfDaysToBackFill = 30;
   androidConfig = new AndroidHealthConfig();
   iOSConfig = new IOSHealthConfig();
 }

package/vital-health-react-native.podspec

@@ -17,7 +17,7 @@ Pod::Spec.new do |s|
   s.source_files = "ios/**/*.{h,m,mm,swift}"
 
   s.dependency "React-Core"
-  s.dependency "VitalHealthKit", "~> 0.10.1"
+  s.dependency "VitalHealthKit", "~> 0.10.6"
 
   # Don't install the dependencies when we run `pod install` in the old architecture.
   if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then