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

persistence: replace calls to persistForDevice with persistSamples

Browse Source
This commit is contained in:
Thomas Kuehne
2026-05-29 01:31:10 +00:00
parent 1569e05acb
commit 3e9c10c0d7
15 changed files with 23 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractTimeSampleProvider.java
+3 -1
View File
@@ -211,7 +211,9 @@ public abstract class AbstractTimeSampleProvider<T extends AbstractTimeSample> i
@NonNull
protected abstract Property getDeviceIdentifierSampleProperty();
public void persistForDevice(final Context context, final GBDevice gbDevice, final List<T> samples) {
/// @deprecated use {@link #persistSamples(List, Context)} instead
@Deprecated
public void persistForDevice(@NonNull final Context context, @Nullable final GBDevice gbDevice, @NonNull final List<T> samples) {
persistSamples(samples, context);
}
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/braun/BraunBPW4500DeviceSupport.java
+1 -1
View File
@@ -240,7 +240,7 @@ public class BraunBPW4500DeviceSupport extends AbstractBTLESingleDeviceSupport {
final DaoSession session = handler.getDaoSession();
final GenericBloodPressureSampleProvider provider =
new GenericBloodPressureSampleProvider(getDevice(), session);
provider.persistForDevice(getContext(), getDevice(), List.of(sample));
provider.persistSamples(List.of(sample), getContext());
persistedMeasurements++;
LOG.info("Persisted blood pressure measurement ({} total)", persistedMeasurements);
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/generic_bp/GenericBloodPressureSupport.java
+1 -4
View File
@@ -21,9 +21,6 @@ import android.bluetooth.BluetoothGattCharacteristic;
import android.content.Intent;
import android.widget.Toast;
import androidx.annotation.CallSuper;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -168,7 +165,7 @@ public class GenericBloodPressureSupport extends AbstractBTLESingleDeviceSupport
try (DBHandler handler = GBApplication.acquireDB()) {
final DaoSession session = handler.getDaoSession();
final GenericBloodPressureSampleProvider sampleProvider = new GenericBloodPressureSampleProvider(getDevice(), session);
sampleProvider.persistForDevice(getContext(), getDevice(), List.of(sample));
sampleProvider.persistSamples(List.of(sample), getContext());
persistedMeasurements++;
} catch (final Exception e) {
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/generic_hr/GenericHeartRateSupport.kt
+1 -1
View File
@@ -177,7 +177,7 @@ class GenericHeartRateSupport : AbstractBTLESingleDeviceSupport(LOG) {
}
val rrIntervalSampleProvider = HeartRrIntervalSampleProvider(this.device, db.getDaoSession())
rrIntervalSampleProvider.persistForDevice(context, device, rrIntervalSampleList)
rrIntervalSampleProvider.persistSamples(rrIntervalSampleList, context)
}
}
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/gloryfit/GloryFitFetcher.kt
+6 -7
View File
@@ -210,7 +210,7 @@ class GloryFitFetcher(val mSupport: GloryFitSupport) {
val session = handler.getDaoSession()
val sampleProvider = GenericSleepStageSampleProvider(mSupport.device, session)
sampleProvider.persistForDevice(mSupport.context, mSupport.device, samples)
sampleProvider.persistSamples(samples, mSupport.context)
}
} catch (e: Exception) {
GB.toast(mSupport.context, "Error saving sleep session samples", Toast.LENGTH_LONG, GB.ERROR, e)
@@ -254,10 +254,9 @@ class GloryFitFetcher(val mSupport: GloryFitSupport) {
val session = handler.getDaoSession()
val sampleProvider = GloryFitStepsSampleProvider(mSupport.device, session)
sampleProvider.persistForDevice(
mSupport.context,
mSupport.device,
Collections.singletonList(sample)
sampleProvider.persistSamples(
Collections.singletonList(sample),
mSupport.context
)
}
} catch (e: Exception) {
@@ -306,7 +305,7 @@ class GloryFitFetcher(val mSupport: GloryFitSupport) {
val session = handler.getDaoSession()
val sampleProvider = GenericHeartRateSampleProvider(mSupport.device, session)
sampleProvider.persistForDevice(mSupport.context, mSupport.device, samples)
sampleProvider.persistSamples(samples, mSupport.context)
}
} catch (e: Exception) {
GB.toast(mSupport.context, "Error saving hr samples", Toast.LENGTH_LONG, GB.ERROR, e)
@@ -369,7 +368,7 @@ class GloryFitFetcher(val mSupport: GloryFitSupport) {
val session = handler.getDaoSession()
val sampleProvider = GenericSpo2SampleProvider(mSupport.device, session)
sampleProvider.persistForDevice(mSupport.context, mSupport.device, samples)
sampleProvider.persistSamples(samples, mSupport.context)
}
} catch (e: Exception) {
GB.toast(mSupport.context, "Error saving SpO2 samples", Toast.LENGTH_LONG, GB.ERROR, e)
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/fetch/FetchHrvOperation.java
+1 -1
View File
@@ -91,7 +91,7 @@ public class FetchHrvOperation extends AbstractRepeatingFetchOperation {
final HuamiCoordinator coordinator = (HuamiCoordinator) getDevice().getDeviceCoordinator();
final GenericHrvValueSampleProvider sampleProvider = coordinator.getHrvValueSampleProvider(getDevice(), session);
sampleProvider.persistForDevice(getContext(), getDevice(), samples);
sampleProvider.persistSamples(samples, getContext());
} catch (final Exception e) {
GB.toast(getContext(), "Error saving hrv samples", Toast.LENGTH_LONG, GB.ERROR, e);
return false;
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/fetch/FetchSleepSessionOperation.java
+1 -1
View File
@@ -90,7 +90,7 @@ public class FetchSleepSessionOperation extends AbstractRepeatingFetchOperation
final HuamiSleepSessionSampleProvider sampleProvider = new HuamiSleepSessionSampleProvider(getDevice(), session);
sampleProvider.persistForDevice(getContext(), getDevice(), samples);
sampleProvider.persistSamples(samples, getContext());
} catch (final Exception e) {
GB.toast(getContext(), "Error saving sleep session samples", Toast.LENGTH_LONG, GB.ERROR, e);
return false;
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/fetch/FetchTemperatureOperation.java
+1 -1
View File
@@ -102,7 +102,7 @@ public class FetchTemperatureOperation extends AbstractRepeatingFetchOperation {
final HuamiCoordinator coordinator = (HuamiCoordinator) getDevice().getDeviceCoordinator();
final GenericTemperatureSampleProvider sampleProvider = coordinator.getTemperatureSampleProvider(getDevice(), session);
sampleProvider.persistForDevice(getContext(), getDevice(), samples);
sampleProvider.persistSamples(samples, getContext());
} catch (final Exception e) {
GB.toast(getContext(), "Error saving temperature samples", Toast.LENGTH_LONG, GB.ERROR, e);
return false;
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiSupportProvider.java
+2 -6
View File
@@ -89,7 +89,6 @@ import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.CameraRemote;
import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.GpsAndTime;
import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.Notifications;
import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.Weather;
import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.Workout;
import nodomain.freeyourgadget.gadgetbridge.devices.huawei.ui.HuaweiStressCalibrationFragment;
import nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst;
import nodomain.freeyourgadget.gadgetbridge.entities.HuaweiActivitySample;
@@ -101,9 +100,6 @@ import nodomain.freeyourgadget.gadgetbridge.entities.HuaweiSleepStageSample;
import nodomain.freeyourgadget.gadgetbridge.entities.HuaweiSleepStatsSample;
import nodomain.freeyourgadget.gadgetbridge.entities.HuaweiStressSample;
import nodomain.freeyourgadget.gadgetbridge.entities.HuaweiWorkoutSummarySample;
import nodomain.freeyourgadget.gadgetbridge.entities.HuaweiWorkoutSummarySampleDao;
import nodomain.freeyourgadget.gadgetbridge.entities.HuaweiWorkoutSwimSegmentsSample;
import nodomain.freeyourgadget.gadgetbridge.entities.HuaweiWorkoutSwimSegmentsSampleDao;
import nodomain.freeyourgadget.gadgetbridge.export.AutoGpxExporter;
import nodomain.freeyourgadget.gadgetbridge.externalevents.gps.GBLocationProviderType;
import nodomain.freeyourgadget.gadgetbridge.externalevents.gps.GBLocationService;
@@ -2734,8 +2730,8 @@ public class HuaweiSupportProvider {
}
try (DBHandler db = GBApplication.acquireDB()) {
final DaoSession session = db.getDaoSession();
new HuaweiSleepStatsSampleProvider(gbDevice, session).persistForDevice(context, gbDevice, sleepStatsSamples);
new HuaweiSleepStageSampleProvider(gbDevice, session).persistForDevice(context, gbDevice, sleepStageSamples);
new HuaweiSleepStatsSampleProvider(gbDevice, session).persistSamples(sleepStatsSamples, context);
new HuaweiSleepStageSampleProvider(gbDevice, session).persistSamples(sleepStageSamples, context);
} catch (Exception e) {
LOG.error("Cannot save sleep, continue");
}
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/dictionarysync/HuaweiDictionarySyncEmotion.java
+1 -1
View File
@@ -100,7 +100,7 @@ public class HuaweiDictionarySyncEmotion implements HuaweiDictionarySyncInterfa
}
try (DBHandler db = GBApplication.acquireDB()) {
final DaoSession session = db.getDaoSession();
new HuaweiEmotionsSampleProvider(gbDevice, session).persistForDevice(context, gbDevice, emotionsSamples);
new HuaweiEmotionsSampleProvider(gbDevice, session).persistSamples(emotionsSamples, context);
} catch (Exception e) {
LOG.error("Cannot save emotions samples, continue");
}
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/dictionarysync/HuaweiDictionarySyncHRV.java
+1 -1
View File
@@ -76,7 +76,7 @@ public class HuaweiDictionarySyncHRV implements HuaweiDictionarySyncInterface {
}
try (DBHandler db = GBApplication.acquireDB()) {
final DaoSession session = db.getDaoSession();
new HuaweiHrvValueSampleProvider(gbDevice, session).persistForDevice(context, gbDevice, hrvSamples);
new HuaweiHrvValueSampleProvider(gbDevice, session).persistSamples(hrvSamples, context);
} catch (Exception e) {
LOG.error("Cannot save HRV samples, continue");
}
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/dictionarysync/HuaweiDictionarySyncSkinTemperature.java
+1 -1
View File
@@ -77,7 +77,7 @@ public class HuaweiDictionarySyncSkinTemperature implements HuaweiDictionarySyn
}
try (DBHandler db = GBApplication.acquireDB()) {
final DaoSession session = db.getDaoSession();
new HuaweiTemperatureSampleProvider(gbDevice, session).persistForDevice(context, gbDevice, temperatureSamples);
new HuaweiTemperatureSampleProvider(gbDevice, session).persistSamples(temperatureSamples, context);
} catch (Exception e) {
LOG.error("Cannot save skin temperature samples, continue");
}
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/dictionarysync/HuaweiDictionarySyncSleepApnea.java
+1 -1
View File
@@ -80,7 +80,7 @@ public class HuaweiDictionarySyncSleepApnea implements HuaweiDictionarySyncInte
}
try (DBHandler db = GBApplication.acquireDB()) {
final DaoSession session = db.getDaoSession();
new HuaweiSleepApneaSampleProvider(gbDevice, session).persistForDevice(context, gbDevice, sleepApneaSamples);
new HuaweiSleepApneaSampleProvider(gbDevice, session).persistSamples(sleepApneaSamples, context);
} catch (Exception e) {
LOG.error("Cannot save sleep apnea samples, continue");
}
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/onetouch/OneTouchSupport.kt
+1 -1
View File
@@ -379,7 +379,7 @@ class OneTouchSupport : AbstractBTLESingleDeviceSupport(LOG) {
GBApplication.acquireDB().use { handler ->
val session = handler.getDaoSession()
val sampleProvider = GlucoseSampleProvider(device, session)
sampleProvider.persistForDevice(context, device, samples)
sampleProvider.persistSamples(samples, context)
}
} catch (e: Exception) {
GB.toast(context, "Error storing glucose readings", Toast.LENGTH_LONG, GB.ERROR, e)
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/polar/PolarH10DeviceSupport.java
+1 -1
View File
@@ -311,7 +311,7 @@ public class PolarH10DeviceSupport extends AbstractBTLESingleDeviceSupport {
}
final HeartRrIntervalSampleProvider rrIntervalSampleProvider = new HeartRrIntervalSampleProvider(this.getDevice(), db.getDaoSession());
rrIntervalSampleProvider.persistForDevice(getContext(), getDevice(), rrIntervalSampleList);
rrIntervalSampleProvider.persistSamples(rrIntervalSampleList, getContext());
}
newSamples = true;