diff --git a/packages/health/android/src/main/kotlin/cachet/plugins/health/HealthDataReader.kt b/packages/health/android/src/main/kotlin/cachet/plugins/health/HealthDataReader.kt index 53b60568b..ba0db624c 100644 --- a/packages/health/android/src/main/kotlin/cachet/plugins/health/HealthDataReader.kt +++ b/packages/health/android/src/main/kotlin/cachet/plugins/health/HealthDataReader.kt @@ -29,7 +29,6 @@ class HealthDataReader( private val dataConverter: HealthDataConverter ) { private val recordingFilter = HealthRecordingFilter() - private val permissionChecker = HealthPermissionChecker(context) /** * Retrieves all health data points of a specified type within a given time range. @@ -307,47 +306,33 @@ class HealthDataReader( val record = rec as ExerciseSessionRecord // Get distance data - var totalDistance = 0.0 - if (permissionChecker.isLocationPermissionGranted() && permissionChecker.isHealthDistancePermissionGranted()) { - val distanceRequest = healthConnectClient.readRecords( - ReadRecordsRequest( - recordType = DistanceRecord::class, - timeRangeFilter = TimeRangeFilter.between( - record.startTime, - record.endTime, - ), + val distanceRequest = healthConnectClient.readRecords( + ReadRecordsRequest( + recordType = DistanceRecord::class, + timeRangeFilter = TimeRangeFilter.between( + record.startTime, + record.endTime, ), - ) - for (distanceRec in distanceRequest.records) { - totalDistance += distanceRec.distance.inMeters - } - } else { - Log.i( - "FLUTTER_HEALTH", - "Skipping distance data retrieval for workout due to missing permissions (location or health distance)" - ) + ), + ) + var totalDistance = 0.0 + for (distanceRec in distanceRequest.records) { + totalDistance += distanceRec.distance.inMeters } // Get energy burned data - var totalEnergyBurned = 0.0 - if (permissionChecker.isHealthTotalCaloriesBurnedPermissionGranted()) { - val energyBurnedRequest = healthConnectClient.readRecords( - ReadRecordsRequest( - recordType = TotalCaloriesBurnedRecord::class, - timeRangeFilter = TimeRangeFilter.between( - record.startTime, - record.endTime, - ), + val energyBurnedRequest = healthConnectClient.readRecords( + ReadRecordsRequest( + recordType = TotalCaloriesBurnedRecord::class, + timeRangeFilter = TimeRangeFilter.between( + record.startTime, + record.endTime, ), - ) - for (energyBurnedRec in energyBurnedRequest.records) { - totalEnergyBurned += energyBurnedRec.energy.inKilocalories - } - } else { - Log.i( - "FLUTTER_HEALTH", - "Skipping total calories burned data retrieval for workout due to missing permissions" - ) + ), + ) + var totalEnergyBurned = 0.0 + for (energyBurnedRec in energyBurnedRequest.records) { + totalEnergyBurned += energyBurnedRec.energy.inKilocalories } // Get steps data diff --git a/packages/health/android/src/main/kotlin/cachet/plugins/health/HealthPermissionChecker.kt b/packages/health/android/src/main/kotlin/cachet/plugins/health/HealthPermissionChecker.kt deleted file mode 100644 index 8b890e20c..000000000 --- a/packages/health/android/src/main/kotlin/cachet/plugins/health/HealthPermissionChecker.kt +++ /dev/null @@ -1,39 +0,0 @@ -package cachet.plugins.health - -import android.Manifest -import android.content.Context -import android.content.pm.PackageManager -import androidx.core.content.ContextCompat - -class HealthPermissionChecker(private val context: Context) { - - fun isLocationPermissionGranted(): Boolean { - val fineLocationGranted = ContextCompat.checkSelfPermission( - context, - Manifest.permission.ACCESS_FINE_LOCATION - ) == PackageManager.PERMISSION_GRANTED - - val coarseLocationGranted = ContextCompat.checkSelfPermission( - context, - Manifest.permission.ACCESS_COARSE_LOCATION - ) == PackageManager.PERMISSION_GRANTED - - return fineLocationGranted || coarseLocationGranted - } - - fun isHealthDistancePermissionGranted(): Boolean { - val healthDistancePermission = "android.permission.health.READ_DISTANCE" - return ContextCompat.checkSelfPermission( - context, - healthDistancePermission - ) == PackageManager.PERMISSION_GRANTED - } - - fun isHealthTotalCaloriesBurnedPermissionGranted(): Boolean { - val healthCaloriesPermission = "android.permission.health.READ_TOTAL_CALORIES_BURNED" - return ContextCompat.checkSelfPermission( - context, - healthCaloriesPermission - ) == PackageManager.PERMISSION_GRANTED - } -} \ No newline at end of file