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

Garmin: use harmonised persistSamples methods

Browse Source
This commit is contained in:
Thomas Kuehne
2026-05-29 01:31:05 +00:00
parent 57e493fa86
commit 1569e05acb
1 changed files with 11 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/fit/FitImporter.java
+11 -44
View File
@@ -41,10 +41,13 @@ import java.util.TreeMap;
import nodomain.freeyourgadget.gadgetbridge.GBApplication;
import nodomain.freeyourgadget.gadgetbridge.database.DBHandler;
import nodomain.freeyourgadget.gadgetbridge.database.DBHelper;
import nodomain.freeyourgadget.gadgetbridge.devices.AbstractTimeSampleProvider;
import nodomain.freeyourgadget.gadgetbridge.devices.BaseActivitySummaryProvider;
import nodomain.freeyourgadget.gadgetbridge.devices.BatteryLevelProvider;
import nodomain.freeyourgadget.gadgetbridge.devices.GarminSleepRestlessMomentsSampleProvider;
import nodomain.freeyourgadget.gadgetbridge.devices.GenericMetricSampleProvider;
import nodomain.freeyourgadget.gadgetbridge.devices.GenericTrainingLoadAcuteSampleProvider;
import nodomain.freeyourgadget.gadgetbridge.devices.GenericTrainingLoadChronicSampleProvider;
import nodomain.freeyourgadget.gadgetbridge.devices.PersistanceProvider;
import nodomain.freeyourgadget.gadgetbridge.devices.garmin.GarminActivitySampleProvider;
import nodomain.freeyourgadget.gadgetbridge.devices.garmin.GarminBodyEnergySampleProvider;
import nodomain.freeyourgadget.gadgetbridge.devices.garmin.GarminEventSampleProvider;
@@ -60,7 +63,6 @@ import nodomain.freeyourgadget.gadgetbridge.devices.garmin.GarminSleepStatsSampl
import nodomain.freeyourgadget.gadgetbridge.devices.garmin.GarminSpo2SampleProvider;
import nodomain.freeyourgadget.gadgetbridge.devices.garmin.GarminStressSampleProvider;
import nodomain.freeyourgadget.gadgetbridge.devices.garmin.GarminWorkoutParser;
import nodomain.freeyourgadget.gadgetbridge.entities.AbstractTimeSample;
import nodomain.freeyourgadget.gadgetbridge.entities.BaseActivitySummary;
import nodomain.freeyourgadget.gadgetbridge.entities.BatteryLevel;
import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
@@ -616,7 +618,7 @@ public class FitImporter {
final DaoSession session = handler.getDaoSession();
final long deviceId = DBHelper.getDevice(gbDevice, session).getId();
final long userId = DBHelper.getUser(session).getId();
persistBattery(session, deviceId);
persistAbstractSamples(batterySamples, new BatteryLevelProvider(gbDevice, session));
persistGenericMetrics(session, deviceId, userId);
} catch (final Exception e) {
GB.toast(context, "Error saving generic samples", Toast.LENGTH_LONG, GB.ERROR, e);
@@ -628,15 +630,6 @@ public class FitImporter {
}
}
private void persistBattery(final DaoSession session, final long deviceId) {
if (!batterySamples.isEmpty()) {
for (BatteryLevel batteryLevel : batterySamples) {
batteryLevel.setDeviceId(deviceId);
}
session.getBatteryLevelDao().insertOrReplaceInTx(batterySamples);
}
}
private void persistGenericMetrics(final DaoSession session, final long deviceId, final long userId) {
if (!genericMetricSamples.isEmpty()) {
genericMetricSamples.forEach(sample -> {
@@ -692,13 +685,7 @@ public class FitImporter {
summary.setRawDetailsPath(file.getAbsolutePath());
try {
final Device device = DBHelper.getDevice(gbDevice, session);
final User user = DBHelper.getUser(session);
summary.setDevice(device);
summary.setUser(user);
session.getBaseActivitySummaryDao().insertOrReplace(summary);
persistAbstractSamples(List.of(summary), new BaseActivitySummaryProvider(gbDevice, session));
} catch (final Exception e) {
GB.toast(context, "Error saving workout", Toast.LENGTH_LONG, GB.ERROR, e);
}
@@ -874,20 +861,8 @@ public class FitImporter {
}
}
LOG.debug("Will persist {} activity samples", activitySamples.size());
try {
final Device device = DBHelper.getDevice(gbDevice, session);
final User user = DBHelper.getUser(session);
final GarminActivitySampleProvider sampleProvider = new GarminActivitySampleProvider(gbDevice, session);
for (final GarminActivitySample sample : activitySamples) {
sample.setDevice(device);
sample.setUser(user);
}
sampleProvider.addGBActivitySamples(activitySamples);
persistAbstractSamples(activitySamples, new GarminActivitySampleProvider(gbDevice, session));
} catch (final Exception e) {
GB.toast(context, "Error saving activity samples", Toast.LENGTH_LONG, GB.ERROR, e);
}
@@ -924,9 +899,6 @@ public class FitImporter {
// We only need to fake sleep start and end times, the sample provider will take care of the rest
try {
final Device device = DBHelper.getDevice(gbDevice, session);
final User user = DBHelper.getUser(session);
final GarminEventSampleProvider sampleProvider = new GarminEventSampleProvider(gbDevice, session);
final GarminEventSample sampleFallAsleep = new GarminEventSample();
@@ -934,27 +906,22 @@ public class FitImporter {
sampleFallAsleep.setEvent(74); // sleep
sampleFallAsleep.setEventType(0); // sleep start
sampleFallAsleep.setData(-1L); // in actual samples they're a garmin epoch, this way we can identify them
sampleFallAsleep.setDevice(device);
sampleFallAsleep.setUser(user);
final GarminEventSample sampleWakeUp = new GarminEventSample();
sampleWakeUp.setTimestamp(wakeTimeMillis);
sampleWakeUp.setEvent(74); // sleep
sampleWakeUp.setEventType(1); // sleep end
sampleWakeUp.setData(-1L); // in actual samples they're a garmin epoch, this way we can identify them
sampleWakeUp.setDevice(device);
sampleWakeUp.setUser(user);
sampleProvider.addSample(sampleFallAsleep);
sampleProvider.addSample(sampleWakeUp);
persistAbstractSamples(List.of(sampleFallAsleep, sampleWakeUp), sampleProvider);
} catch (final Exception e) {
GB.toast(context, "Error faking event samples", Toast.LENGTH_LONG, GB.ERROR, e);
}
}
private <T extends AbstractTimeSample> void persistAbstractSamples(final List<T> samples,
final AbstractTimeSampleProvider<T> sampleProvider) {
sampleProvider.persistForDevice(context, gbDevice, samples);
private <T> void persistAbstractSamples(@NonNull final List<T> samples,
@NonNull final PersistanceProvider<T> sampleProvider) {
sampleProvider.persistSamples(samples, context);
}
public static String getFilePath(final FitFileId fileId) {