MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-11-09 03:37:03 +01:00
Code Releases Wiki Activity

Garmin: Fix "ANY" VO2 Max query

Browse Source
This commit is contained in:
José Rebelo 2024-09-18 20:48:18 +01:00
parent 1fd426c09d
commit 8ee03d3c08
1 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/GarminVo2MaxSampleProvider.java
View File

@ -24,6 +24,7 @@ import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
@ -106,31 +107,10 @@ public class GarminVo2MaxSampleProvider implements Vo2MaxSampleProvider<Vo2MaxSa
final QueryBuilder<BaseActivitySummary> qb = summaryDao.queryBuilder();
switch (type) {
case RUNNING:
qb.where(BaseActivitySummaryDao.Properties.ActivityKind.in(Arrays.asList(
ActivityKind.INDOOR_RUNNING.getCode(),
ActivityKind.OUTDOOR_RUNNING.getCode(),
ActivityKind.CROSS_COUNTRY_RUNNING.getCode(),
ActivityKind.RUNNING.getCode()
)));
break;
case CYCLING:
qb.where(BaseActivitySummaryDao.Properties.ActivityKind.in(Arrays.asList(
ActivityKind.CYCLING.getCode(),
ActivityKind.INDOOR_CYCLING.getCode(),
ActivityKind.HANDCYCLING.getCode(),
ActivityKind.HANDCYCLING_INDOOR.getCode(),
ActivityKind.MOTORCYCLING.getCode(),
ActivityKind.OUTDOOR_CYCLING.getCode()
)));
break;
default:
break;
}
addWhereFilter(qb, type);
if (until != 0) {
qb.where(BaseActivitySummaryDao.Properties.EndTime.le(new Date(until)));
qb.where(BaseActivitySummaryDao.Properties.StartTime.le(new Date(until)));
}
qb.where(BaseActivitySummaryDao.Properties.DeviceId.eq(dbDevice.getId()))
@ -143,6 +123,31 @@ public class GarminVo2MaxSampleProvider implements Vo2MaxSampleProvider<Vo2MaxSa
return !samples.isEmpty() ? GarminVo2maxSample.fromActivitySummary(samples.get(0)) : null;
}
private static void addWhereFilter(final QueryBuilder<BaseActivitySummary> qb, final Vo2MaxSample.Type type) {
final List<Integer> codes = new ArrayList<>();
if (type == Vo2MaxSample.Type.ANY || type == Vo2MaxSample.Type.RUNNING) {
codes.addAll(Arrays.asList(
ActivityKind.INDOOR_RUNNING.getCode(),
ActivityKind.OUTDOOR_RUNNING.getCode(),
ActivityKind.CROSS_COUNTRY_RUNNING.getCode(),
ActivityKind.RUNNING.getCode()
));
}
if (type == Vo2MaxSample.Type.ANY || type == Vo2MaxSample.Type.CYCLING) {
codes.addAll(Arrays.asList(
ActivityKind.CYCLING.getCode(),
ActivityKind.INDOOR_CYCLING.getCode(),
ActivityKind.HANDCYCLING.getCode(),
ActivityKind.HANDCYCLING_INDOOR.getCode(),
ActivityKind.MOTORCYCLING.getCode(),
ActivityKind.OUTDOOR_CYCLING.getCode()
));
}
qb.where(BaseActivitySummaryDao.Properties.ActivityKind.in(codes));
}
@Nullable
@Override
public Vo2MaxSample getLatestSample() {
@ -170,6 +175,7 @@ public class GarminVo2MaxSampleProvider implements Vo2MaxSampleProvider<Vo2MaxSa
return !samples.isEmpty() ? GarminVo2maxSample.fromActivitySummary(samples.get(0)) : null;
}
public static class GarminVo2maxSample implements Vo2MaxSample {
private final long timestamp;
private final Type type;