@kingstinct/react-native-healthkit 14.0.0 → 14.0.2

package/app.plugin.js

@@ -53,20 +53,26 @@ const withEntitlementsPlugin = (
 const withInfoPlistPlugin = (
   config,
   /**
-   * @type {{NSHealthShareUsageDescription: string | true, NSHealthUpdateUsageDescription: string | true} | undefined}
+   * @type {{NSHealthShareUsageDescription?: string | true, NSHealthUpdateUsageDescription?: string | false} | undefined}
    * */
   props,
 ) =>
   withInfoPlist(config, (config) => {
     config.modResults.NSHealthShareUsageDescription =
-      typeof props.NSHealthShareUsageDescription === 'string'
+      typeof props?.NSHealthShareUsageDescription === 'string'
         ? props.NSHealthShareUsageDescription
-        : `${config.name} wants to read your health data`
+        : typeof config.modResults.NSHealthShareUsageDescription === 'string'
+          ? config.modResults.NSHealthShareUsageDescription
+          : `${config.name} wants to read your health data`
 
-    config.modResults.NSHealthUpdateUsageDescription =
-      typeof props.NSHealthUpdateUsageDescription === 'string'
-        ? props.NSHealthUpdateUsageDescription
-        : `${config.name} wants to update your health data`
+    if (props?.NSHealthUpdateUsageDescription !== false) {
+      config.modResults.NSHealthUpdateUsageDescription =
+        typeof props?.NSHealthUpdateUsageDescription === 'string'
+          ? props.NSHealthUpdateUsageDescription
+          : typeof config.modResults.NSHealthUpdateUsageDescription === 'string'
+            ? config.modResults.NSHealthUpdateUsageDescription
+            : `${config.name} wants to update your health data`
+    }
 
     return config
   })

package/app.plugin.ts

@@ -13,7 +13,7 @@ type BackgroundConfig = boolean
 
 type InfoPlistConfig = {
   NSHealthShareUsageDescription?: string | true
-  NSHealthUpdateUsageDescription?: string | true
+  NSHealthUpdateUsageDescription?: string | false
 }
 
 type AppPluginConfig = InfoPlistConfig & {
@@ -40,17 +40,25 @@ const withEntitlementsPlugin: ConfigPlugin<{
 
 const withInfoPlistPlugin: ConfigPlugin<InfoPlistConfig> = (config, props) => {
   return withInfoPlist(config, (configPlist) => {
+    const existingShareDescription =
+      configPlist.modResults.NSHealthShareUsageDescription
     configPlist.modResults.NSHealthShareUsageDescription =
-      typeof props.NSHealthShareUsageDescription === 'string'
+      typeof props?.NSHealthShareUsageDescription === 'string'
         ? props.NSHealthShareUsageDescription
-        : `${config.name ?? pkg.name} wants to read your health data`
-
-    // Add description if it's not undefined and not explicitly false
-
-    configPlist.modResults.NSHealthUpdateUsageDescription =
-      typeof props.NSHealthUpdateUsageDescription === 'string'
-        ? props.NSHealthUpdateUsageDescription
-        : `${config.name ?? pkg.name} wants to update your health data`
+        : typeof existingShareDescription === 'string'
+          ? existingShareDescription
+          : `${config.name ?? pkg.name} wants to read your health data`
+
+    if (props?.NSHealthUpdateUsageDescription !== false) {
+      const existingUpdateDescription =
+        configPlist.modResults.NSHealthUpdateUsageDescription
+      configPlist.modResults.NSHealthUpdateUsageDescription =
+        typeof props?.NSHealthUpdateUsageDescription === 'string'
+          ? props.NSHealthUpdateUsageDescription
+          : typeof existingUpdateDescription === 'string'
+            ? existingUpdateDescription
+            : `${config.name ?? pkg.name} wants to update your health data`
+    }
 
     return configPlist
   })

package/ios/Helpers.swift

@@ -86,14 +86,11 @@ func serializeAnchor(anchor: HKQueryAnchor?) -> String? {
 }
 
 func toBase64(_ data: Any?) -> String? {
-  if let data = data {
-    let data = NSKeyedArchiver.archivedData(withRootObject: data)
-    let encoded = data.base64EncodedString()
-
-    return encoded
+  guard let archivedData = try? NSKeyedArchiver.archivedData(withRootObject: data, requiringSecureCoding: true) else {
+    return nil
   }
 
-  return nil
+  return archivedData.base64EncodedString()
 }
 
 func sampleQueryAsync(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kingstinct/react-native-healthkit",
-  "version": "14.0.0",
+  "version": "14.0.2",
   "description": "React Native bindings for HealthKit",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",