demus/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge.git synced 2026-07-31 07:44:24 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

Fix cadence syncing to only sync for appropriate activity types

Browse Source 
Use ActivityKind.getCycleUnit() to determine if cadence should be synced.
Only sync StepsCadenceRecord for step-based activities (walking, running, hiking) and CyclingPedalingCadenceRecord for cycling activities.
Skip cadence syncing for activities with other cycle units (strokes, jumps, reps, swings) as Health Connect lacks appropriate cadence record types.

Note: Swimming workouts with stroke data (freestyle, backstroke, etc.) could be synced as ExerciseSegment records in a future enhancement.
This commit is contained in:
Gideon Zenz
2026-01-16 22:12:23 +01:00
committed by José Rebelo
parent 46925c2dde
commit 3bebe6563d
1 changed files with 53 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/healthconnect/syncers/RecordedWorkoutSyncer.kt
+53 -47
View File
@@ -333,7 +333,7 @@ internal object RecordedWorkoutSyncer {
addCaloriesRecords(summaryData, workoutStartInstant, workoutEndInstant, offset, metadata, grantedPermissions, recordsToInsert, deviceName)
addElevationGainedRecord(summaryData, workoutStartInstant, workoutEndInstant, offset, metadata, grantedPermissions, recordsToInsert, deviceName)
addStepsRecord(summaryData, workoutStartInstant, workoutEndInstant, offset, metadata, grantedPermissions, recordsToInsert, deviceName)
addCadenceRecords(summaryData, exerciseType, workoutStartInstant, workoutEndInstant, offset, metadata, grantedPermissions, recordsToInsert, deviceName)
addCadenceRecords(summaryData, activityKind, workoutStartInstant, workoutEndInstant, offset, metadata, grantedPermissions, recordsToInsert, deviceName)
}
}
@@ -393,7 +393,7 @@ internal object RecordedWorkoutSyncer {
addCaloriesRecords(summaryData, workoutStartInstant, workoutEndInstant, offset, metadata, grantedPermissions, recordsToInsert, deviceName)
addElevationGainedRecord(summaryData, workoutStartInstant, workoutEndInstant, offset, metadata, grantedPermissions, recordsToInsert, deviceName)
addStepsRecord(summaryData, workoutStartInstant, workoutEndInstant, offset, metadata, grantedPermissions, recordsToInsert, deviceName)
addCadenceRecords(summaryData, exerciseType, workoutStartInstant, workoutEndInstant, offset, metadata, grantedPermissions, recordsToInsert, deviceName)
addCadenceRecords(summaryData, activityKind, workoutStartInstant, workoutEndInstant, offset, metadata, grantedPermissions, recordsToInsert, deviceName)
} else {
LOG.warn("No summary data available for workout on device '{}' at {}", deviceName, workoutStartInstant)
}
@@ -791,7 +791,7 @@ internal object RecordedWorkoutSyncer {
private fun addCadenceRecords(
summaryData: ActivitySummaryData,
exerciseType: Int,
activityKind: ActivityKind,
startTime: Instant,
endTime: Instant,
offset: ZoneOffset,
@@ -805,54 +805,60 @@ internal object RecordedWorkoutSyncer {
return
}
// Determine if this is a cycling or walking/running workout
val isCyclingWorkout = when (exerciseType) {
ExerciseSessionRecord.EXERCISE_TYPE_BIKING,
ExerciseSessionRecord.EXERCISE_TYPE_BIKING_STATIONARY -> true
else -> false
}
// Check the cycle unit to determine if cadence syncing is appropriate
val cycleUnit = ActivityKind.getCycleUnit(activityKind)
if (isCyclingWorkout) {
val cyclingCadencePermission = HealthPermission.getWritePermission(CyclingPedalingCadenceRecord::class)
if (cyclingCadencePermission in grantedPermissions) {
val midTime = startTime.plusSeconds((endTime.epochSecond - startTime.epochSecond) / 2)
recordsToInsert.add(
CyclingPedalingCadenceRecord(
startTime = midTime,
startZoneOffset = offset,
endTime = midTime,
endZoneOffset = offset,
samples = listOf(
CyclingPedalingCadenceRecord.Sample(
time = midTime,
revolutionsPerMinute = cadenceAvg.toDouble()
)
),
metadata = metadata
when (cycleUnit) {
ActivityKind.CycleUnit.STEPS -> {
// Sync as StepsCadenceRecord for step-based activities (walking, running, hiking)
val stepsCadencePermission = HealthPermission.getWritePermission(StepsCadenceRecord::class)
if (stepsCadencePermission in grantedPermissions) {
val midTime = startTime.plusSeconds((endTime.epochSecond - startTime.epochSecond) / 2)
recordsToInsert.add(
StepsCadenceRecord(
startTime = midTime,
startZoneOffset = offset,
endTime = midTime,
endZoneOffset = offset,
samples = listOf(
StepsCadenceRecord.Sample(
time = midTime,
rate = cadenceAvg.toDouble()
)
),
metadata = metadata
)
)
)
LOG.debug("Added CyclingPedalingCadenceRecord (avg: {} rpm) for workout at {} for device '{}'.", cadenceAvg, startTime, deviceName)
LOG.debug("Added StepsCadenceRecord (avg: {} steps/min) for workout at {} for device '{}'.", cadenceAvg, startTime, deviceName)
}
}
} else {
val stepsCadencePermission = HealthPermission.getWritePermission(StepsCadenceRecord::class)
if (stepsCadencePermission in grantedPermissions) {
val midTime = startTime.plusSeconds((endTime.epochSecond - startTime.epochSecond) / 2)
recordsToInsert.add(
StepsCadenceRecord(
startTime = midTime,
startZoneOffset = offset,
endTime = midTime,
endZoneOffset = offset,
samples = listOf(
StepsCadenceRecord.Sample(
time = midTime,
rate = cadenceAvg.toDouble()
)
),
metadata = metadata
ActivityKind.CycleUnit.REVOLUTIONS -> {
// Sync as CyclingPedalingCadenceRecord for cycling activities
val cyclingCadencePermission = HealthPermission.getWritePermission(CyclingPedalingCadenceRecord::class)
if (cyclingCadencePermission in grantedPermissions) {
val midTime = startTime.plusSeconds((endTime.epochSecond - startTime.epochSecond) / 2)
recordsToInsert.add(
CyclingPedalingCadenceRecord(
startTime = midTime,
startZoneOffset = offset,
endTime = midTime,
endZoneOffset = offset,
samples = listOf(
CyclingPedalingCadenceRecord.Sample(
time = midTime,
revolutionsPerMinute = cadenceAvg.toDouble()
)
),
metadata = metadata
)
)
)
LOG.debug("Added StepsCadenceRecord (avg: {} steps/min) for workout at {} for device '{}'.", cadenceAvg, startTime, deviceName)
LOG.debug("Added CyclingPedalingCadenceRecord (avg: {} rpm) for workout at {} for device '{}'.", cadenceAvg, startTime, deviceName)
}
}
else -> {
// Skip cadence syncing for other cycle units (strokes, jumps, reps, swings, none)
// Health Connect doesn't have dedicated cadence records for these activity types
LOG.debug("Skipping cadence sync for {} activity (cycle unit: {}) - no appropriate Health Connect record type.", activityKind, cycleUnit)
}
}
}