Skip to content

Revert "[health] Fix: Only fetch distance data for workouts when explicitly requested" #1219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 24, 2025
Merged

Revert "[health] Fix: Only fetch distance data for workouts when explicitly requested" #1219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 22 additions & 37 deletions packages/health/android/src/main/kotlin/cachet/plugins/health/HealthDataReader.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down
39 changes: 0 additions & 39 deletions packages/health/android/src/main/kotlin/cachet/plugins/health/HealthPermissionChecker.kt
View file
Open in desktop

This file was deleted.