Merge remote-tracking branch 'upstream/main'

Author: mikitu

android/build.gradle

@@ -92,7 +92,7 @@ dependencies {
   implementation "com.facebook.react:react-native"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
   implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
-  implementation "androidx.health.connect:connect-client:1.1.0-alpha10"
+  implementation "androidx.health.connect:connect-client:1.1.0-alpha11"
 }
 
 if (isNewArchitectureEnabled()) {

android/src/main/java/dev/matinzd/healthconnect/permissions/PermissionUtils.kt

@@ -10,35 +10,34 @@ import dev.matinzd.healthconnect.utils.reactRecordTypeToClassMap
 class PermissionUtils {
   companion object {
     fun parsePermissions(reactPermissions: ReadableArray): Set<String> {
-      return reactPermissions
-              .toArrayList()
-              .mapNotNull {
-                it as HashMap<*, *>
-                val recordType = it["recordType"]
-                val accessType = it["accessType"]
+      return reactPermissions.toArrayList().mapNotNull {
+        it as HashMap<*, *>
+        val recordType = it["recordType"]
+        val accessType = it["accessType"]
 
-                if (accessType == "write" && recordType == "ExerciseRoute") {
-                  return@mapNotNull HealthPermission.PERMISSION_WRITE_EXERCISE_ROUTE
-                }
+        if (accessType == "write" && recordType == "ExerciseRoute") {
+          return@mapNotNull HealthPermission.PERMISSION_WRITE_EXERCISE_ROUTE
+        }
 
-                if (accessType == "read" && recordType == "BackgroundAccessPermission") {
-                  return@mapNotNull HealthPermission.PERMISSION_READ_HEALTH_DATA_IN_BACKGROUND
-                }
+        if (accessType == "read" && recordType == "ReadHealthDataHistory") {
+          return@mapNotNull HealthPermission.PERMISSION_READ_HEALTH_DATA_HISTORY
+        }
 
-                val recordClass = reactRecordTypeToClassMap[recordType] ?: throw InvalidRecordType()
+        if (accessType == "read" && recordType == "BackgroundAccessPermission") {
+          return@mapNotNull HealthPermission.PERMISSION_READ_HEALTH_DATA_IN_BACKGROUND
+        }
 
-                when (accessType) {
-                  "write" -> HealthPermission.getWritePermission(recordClass)
-                  "read" -> HealthPermission.getReadPermission(recordClass)
-                  else -> null
-                }
-              }
-              .toSet()
+        val recordClass = reactRecordTypeToClassMap[recordType] ?: throw InvalidRecordType()
+
+        when (accessType) {
+          "write" -> HealthPermission.getWritePermission(recordClass)
+          "read" -> HealthPermission.getReadPermission(recordClass)
+          else -> null
+        }
+      }.toSet()
     }
 
-    suspend fun getGrantedPermissions(
-            permissionController: PermissionController
-    ): WritableNativeArray {
+    suspend fun getGrantedPermissions(permissionController: PermissionController): WritableNativeArray {
       return mapPermissionResult(permissionController.getGrantedPermissions())
     }
 

android/src/main/java/dev/matinzd/healthconnect/records/ReactHealthRecord.kt

@@ -52,7 +52,7 @@ class ReactHealthRecord {
     }
 
     fun parseWriteRecords(reactRecords: ReadableArray): List<Record> {
-      val recordType = reactRecords.getMap(0).getString("recordType")
+      val recordType = reactRecords.getMap(0)?.getString("recordType")
 
       val recordClass = createReactHealthRecordInstance<Record>(recordType)
 

android/src/main/java/dev/matinzd/healthconnect/utils/HealthConnectUtils.kt

@@ -62,7 +62,10 @@ fun convertJsToRecordTypeSet(readableArray: ReadableArray?): Set<KClass<out Reco
 fun ReadableArray.toMapList(): List<ReadableMap> {
   val list = mutableListOf<ReadableMap>()
   for (i in 0 until size()) {
-    list.add(getMap(i))
+    val item = getMap(i)
+    if (null != item) {
+      list.add(item)
+    }
   }
   return list
 }

example/android/app/src/main/AndroidManifest.xml

@@ -7,6 +7,7 @@
     <uses-permission android:name="android.permission.health.WRITE_EXERCISE"/>
     <uses-permission android:name="android.permission.health.READ_EXERCISE_ROUTES"/>
     <uses-permission android:name="android.permission.health.WRITE_EXERCISE_ROUTE"/>
+    <uses-permission android:name="android.permission.health.READ_HEALTH_DATA_HISTORY"/>
     <uses-permission android:name="android.permission.health.READ_HEALTH_DATA_IN_BACKGROUND"/>
 
     <application

example/src/App.tsx

@@ -266,6 +266,10 @@ export default function App() {
         accessType: 'write',
         recordType: 'ExerciseRoute',
       },
+      {
+        accessType: 'read',
+        recordType: 'ReadHealthDataHistory',
+      },
     ]).then((permissions) => {
       console.log('Granted permissions on request ', { permissions });
     });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-health-connect",
-  "version": "3.3.2",
+  "version": "3.3.3",
   "description": "React native library for health connect (Android only)",
   "funding": "https://github.com/matinzd/react-native-health-connect?sponsor=1",
   "main": "lib/commonjs/index",

src/NativeHealthConnect.ts

@@ -4,6 +4,7 @@ import type {
   HealthConnectRecord,
   Permission,
   WriteExerciseRoutePermission,
+  ReadHealthDataHistoryPermission,
 } from './types';
 import type { ExerciseRoute } from './types/base.types';
 
@@ -23,7 +24,11 @@ export interface Spec extends TurboModule {
   openHealthConnectSettings: () => void;
   openHealthConnectDataManagement: (providerPackageName?: string) => void;
   requestPermission(
-    permissions: (Permission | WriteExerciseRoutePermission)[]
+    permissions: (
+      | Permission
+      | WriteExerciseRoutePermission
+      | ReadHealthDataHistoryPermission
+    )[]
   ): Promise<Permission[]>;
   requestExerciseRoute(recordId: string): Promise<ExerciseRoute>;
   getGrantedPermissions(): Promise<Permission[]>;

src/index.tsx

@@ -16,6 +16,7 @@ import type {
   GetChangesRequest,
   GetChangesResults,
   WriteExerciseRoutePermission,
+  ReadHealthDataHistoryPermission,
   BackgroundAccessPermission,
   RevokeAllPermissionsResponse,
 } from './types';
@@ -104,9 +105,15 @@ export function requestPermission(
     | Permission
     | WriteExerciseRoutePermission
     | BackgroundAccessPermission
+    | ReadHealthDataHistoryPermission
   )[]
 ): Promise<
-  (Permission | WriteExerciseRoutePermission | BackgroundAccessPermission)[]
+  (
+    | Permission
+    | WriteExerciseRoutePermission
+    | ReadHealthDataHistoryPermission
+    | BackgroundAccessPermission
+  )[]
 > {
   return HealthConnect.requestPermission(permissions);
 }

src/types/index.ts

@@ -32,6 +32,11 @@ export interface RevokeAllPermissionsResponse {
   message?: string;
 }
 
+export interface ReadHealthDataHistoryPermission {
+  accessType: 'read';
+  recordType: 'ReadHealthDataHistory';
+}
+
 export * from './records.types';
 export * from './results.types';
 export * from './aggregate.types';