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 timestamp issues

Browse Source
This commit is contained in:
Gideon Zenz
2026-01-03 15:03:21 +01:00
committed by José Rebelo
parent fd29be7b4a
commit 1bdf0bd130
1 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/healthconnect/HealthConnectUtils.kt
+25 -17
View File
@@ -36,6 +36,7 @@ import nodomain.freeyourgadget.gadgetbridge.database.DBHelper
import nodomain.freeyourgadget.gadgetbridge.devices.AbstractSampleProvider
import nodomain.freeyourgadget.gadgetbridge.devices.DeviceCoordinator
import nodomain.freeyourgadget.gadgetbridge.devices.TimeSampleProvider
import nodomain.freeyourgadget.gadgetbridge.entities.BaseActivitySummaryDao
import nodomain.freeyourgadget.gadgetbridge.entities.HealthConnectSyncState
import nodomain.freeyourgadget.gadgetbridge.entities.HealthConnectSyncStateDao
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice
@@ -266,11 +267,8 @@ class HealthConnectUtils {
manufacturer = deviceCoordinator.manufacturer,
model = gbDevice.model
)
// Filter out WORKOUTS - it's only for permission grouping, actual workout syncing happens via ACTIVITY data type
val dataTypesToSync = HealthConnectPermissionManager.HealthConnectDataType.entries
.filter { it != HealthConnectPermissionManager.HealthConnectDataType.WORKOUTS }
dataTypeLoop@ for (dataType in dataTypesToSync) {
dataTypeLoop@ for (dataType in HealthConnectPermissionManager.HealthConnectDataType.entries) {
// Check if worker has been cancelled
if (worker?.isStopped == true) {
LOG.info("$HC_SYNC_TAG Worker has been cancelled, aborting sync")
@@ -569,16 +567,6 @@ class HealthConnectUtils {
currentSliceStartTs, currentSliceEndTs, grantedPermissions, activityBasedSamples
))
}
// Sync explicitly recorded workouts (independent from activityBasedSamples)
// RecordedWorkoutSyncer queries BaseActivitySummary directly from database
val coordinator = gbDevice.deviceCoordinator
if (coordinator.supportsActivityTracks(gbDevice)) {
sliceStats.add(RecordedWorkoutSyncer.sync(
healthConnectClient, gbDevice, metadata, offset,
currentSliceStartTs, currentSliceEndTs, grantedPermissions, context
))
}
}
HealthConnectPermissionManager.HealthConnectDataType.SLEEP -> {
if (!activityBasedSamples.isNullOrEmpty()) {
@@ -609,9 +597,14 @@ class HealthConnectUtils {
currentSliceStartTs, currentSliceEndTs, grantedPermissions
))
HealthConnectPermissionManager.HealthConnectDataType.WORKOUTS -> {
// Should never reach here - WORKOUTS is filtered from iteration
// Workouts are synced via ACTIVITY using RecordedWorkoutSyncer (requires activityBasedSamples)
error("WORKOUTS should not be processed - it's filtered from dataTypesToSync")
// Sync explicitly recorded workouts from BaseActivitySummary
val coordinator = gbDevice.deviceCoordinator
if (coordinator.supportsActivityTracks(gbDevice)) {
sliceStats.add(RecordedWorkoutSyncer.sync(
healthConnectClient, gbDevice, metadata, offset,
currentSliceStartTs, currentSliceEndTs, grantedPermissions, context
))
}
}
}
@@ -685,6 +678,21 @@ class HealthConnectUtils {
}
return latestMilli?.let { Instant.ofEpochMilli(it) }
}
if (dataType == HealthConnectPermissionManager.HealthConnectDataType.WORKOUTS) {
// For WORKOUTS, query BaseActivitySummary directly
if (!deviceCoordinator.supportsActivityTracks(device)) {
return null
}
val deviceEntity = DBHelper.getDevice(device, db.daoSession) ?: return null
val latestWorkout = db.daoSession.baseActivitySummaryDao?.queryBuilder()
?.where(BaseActivitySummaryDao.Properties.DeviceId.eq(deviceEntity.id))
?.orderDesc(BaseActivitySummaryDao.Properties.EndTime)
?.limit(1)
?.unique()
return latestWorkout?.endTime?.toInstant()
}
val provider = getProviderForDataType(deviceCoordinator, device, db, dataType)
return when (provider) {
is TimeSampleProvider<*> -> {