MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2025-01-26 17:47:34 +01:00
Code Releases Wiki Activity

HuaweiSampleProvider: Improve getRawOrderedActivitySamples

Browse Source 
Currently only ActivitySamples that *start* within the specified time
frame are loaded from the DB, but ActivitySamples that end in the specified
time frame are ignored. On the Dashboard and the activity summary chart
some activities might thus be missing.

Since the sleep activity usually starts hours before midnight it doesn't
get loaded and the Dashboard doesn't properly display the sleep phase.

To fix this issue load all ActivitySamples that overlay the specified
time frame, that means it also loads samples that end within the timeframe.

Fixes issue #4510

Signed-off-by: Patrick Rudolph <rudolphpatrick05@gmail.com>
This commit is contained in:
Patrick Rudolph 2025-01-12 11:15:13 +01:00 committed by José Rebelo
parent 52d3128474
commit 9830ae20e0
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSampleProvider.java
View File

@ -113,6 +113,11 @@ public class HuaweiSampleProvider extends AbstractSampleProvider<HuaweiActivityS
return HuaweiActivitySampleDao.Properties.Timestamp;
}
@NonNull
protected Property getOthertimestampSampleProperty() {
return HuaweiActivitySampleDao.Properties.OtherTimestamp;
}
@NonNull
@Override
protected Property getDeviceIdentifierSampleProperty() {
@ -248,13 +253,14 @@ public class HuaweiSampleProvider extends AbstractSampleProvider<HuaweiActivityS
private List<HuaweiActivitySample> getRawOrderedActivitySamples(int timestampFrom, int timestampTo) {
QueryBuilder<HuaweiActivitySample> qb = getSampleDao().queryBuilder();
Property timestampProperty = getTimestampSampleProperty();
Property otherTimestampProperty = getOthertimestampSampleProperty();
Device dbDevice = DBHelper.findDevice(getDevice(), getSession());
if (dbDevice == null) {
// no device, no samples
return Collections.emptyList();
}
Property deviceProperty = getDeviceIdentifierSampleProperty();
qb.where(deviceProperty.eq(dbDevice.getId()), timestampProperty.ge(timestampFrom))
qb.where(deviceProperty.eq(dbDevice.getId()), otherTimestampProperty.ge(timestampFrom))
.where(timestampProperty.le(timestampTo))
.orderAsc(timestampProperty);
List<HuaweiActivitySample> samples = qb.build().list();