mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-21 16:02:04 +02:00
Code Issues Releases Wiki Activity

Don't set auto values if measurement is disabled

Browse Source
This commit is contained in:
Erik Johansson
2018-03-23 20:49:58 +01:00
parent 4342fce46f
commit 4bbcea751b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
android_app/app/src/main/java/com/health/openscale/core/OpenScale.java
View File

@@ -259,21 +259,21 @@ public class OpenScale {
} }
MeasurementViewSettings settings = new MeasurementViewSettings(prefs, WaterMeasurementView.KEY); MeasurementViewSettings settings = new MeasurementViewSettings(prefs, WaterMeasurementView.KEY);
if (settings.isEstimationEnabled()) { if (settings.isEnabled() && settings.isEstimationEnabled()) {
EstimatedWaterMetric waterMetric = EstimatedWaterMetric.getEstimatedMetric( EstimatedWaterMetric waterMetric = EstimatedWaterMetric.getEstimatedMetric(
EstimatedWaterMetric.FORMULA.valueOf(settings.getEstimationFormula())); EstimatedWaterMetric.FORMULA.valueOf(settings.getEstimationFormula()));
scaleMeasurement.setWater(waterMetric.getWater(getScaleUser(scaleMeasurement.getUserId()), scaleMeasurement)); scaleMeasurement.setWater(waterMetric.getWater(getScaleUser(scaleMeasurement.getUserId()), scaleMeasurement));
} }
settings = new MeasurementViewSettings(prefs, LBWMeasurementView.KEY); settings = new MeasurementViewSettings(prefs, LBWMeasurementView.KEY);
if (settings.isEstimationEnabled()) { if (settings.isEnabled() && settings.isEstimationEnabled()) {
EstimatedLBWMetric lbwMetric = EstimatedLBWMetric.getEstimatedMetric( EstimatedLBWMetric lbwMetric = EstimatedLBWMetric.getEstimatedMetric(
EstimatedLBWMetric.FORMULA.valueOf(settings.getEstimationFormula())); EstimatedLBWMetric.FORMULA.valueOf(settings.getEstimationFormula()));
scaleMeasurement.setLbw(lbwMetric.getLBW(getScaleUser(scaleMeasurement.getUserId()), scaleMeasurement)); scaleMeasurement.setLbw(lbwMetric.getLBW(getScaleUser(scaleMeasurement.getUserId()), scaleMeasurement));
} }
settings = new MeasurementViewSettings(prefs, FatMeasurementView.KEY); settings = new MeasurementViewSettings(prefs, FatMeasurementView.KEY);
if (settings.isEstimationEnabled()) { if (settings.isEnabled() && settings.isEstimationEnabled()) {
EstimatedFatMetric fatMetric = EstimatedFatMetric.getEstimatedMetric( EstimatedFatMetric fatMetric = EstimatedFatMetric.getEstimatedMetric(
EstimatedFatMetric.FORMULA.valueOf(settings.getEstimationFormula())); EstimatedFatMetric.FORMULA.valueOf(settings.getEstimationFormula()));
scaleMeasurement.setFat(fatMetric.getFat(getScaleUser(scaleMeasurement.getUserId()), scaleMeasurement)); scaleMeasurement.setFat(fatMetric.getFat(getScaleUser(scaleMeasurement.getUserId()), scaleMeasurement));