From 4bbcea751bd846d6d6bb73ad46e1ae239ae81ab7 Mon Sep 17 00:00:00 2001 From: Erik Johansson Date: Fri, 23 Mar 2018 20:49:58 +0100 Subject: [PATCH] Don't set auto values if measurement is disabled --- .../src/main/java/com/health/openscale/core/OpenScale.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/android_app/app/src/main/java/com/health/openscale/core/OpenScale.java b/android_app/app/src/main/java/com/health/openscale/core/OpenScale.java index 90e2818f..96c1849f 100644 --- a/android_app/app/src/main/java/com/health/openscale/core/OpenScale.java +++ b/android_app/app/src/main/java/com/health/openscale/core/OpenScale.java @@ -259,21 +259,21 @@ public class OpenScale { } MeasurementViewSettings settings = new MeasurementViewSettings(prefs, WaterMeasurementView.KEY); - if (settings.isEstimationEnabled()) { + if (settings.isEnabled() && settings.isEstimationEnabled()) { EstimatedWaterMetric waterMetric = EstimatedWaterMetric.getEstimatedMetric( EstimatedWaterMetric.FORMULA.valueOf(settings.getEstimationFormula())); scaleMeasurement.setWater(waterMetric.getWater(getScaleUser(scaleMeasurement.getUserId()), scaleMeasurement)); } settings = new MeasurementViewSettings(prefs, LBWMeasurementView.KEY); - if (settings.isEstimationEnabled()) { + if (settings.isEnabled() && settings.isEstimationEnabled()) { EstimatedLBWMetric lbwMetric = EstimatedLBWMetric.getEstimatedMetric( EstimatedLBWMetric.FORMULA.valueOf(settings.getEstimationFormula())); scaleMeasurement.setLbw(lbwMetric.getLBW(getScaleUser(scaleMeasurement.getUserId()), scaleMeasurement)); } settings = new MeasurementViewSettings(prefs, FatMeasurementView.KEY); - if (settings.isEstimationEnabled()) { + if (settings.isEnabled() && settings.isEstimationEnabled()) { EstimatedFatMetric fatMetric = EstimatedFatMetric.getEstimatedMetric( EstimatedFatMetric.FORMULA.valueOf(settings.getEstimationFormula())); scaleMeasurement.setFat(fatMetric.getFat(getScaleUser(scaleMeasurement.getUserId()), scaleMeasurement));