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 ff72ed47..79596aa1 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 @@ -319,7 +319,7 @@ public class OpenScale { for (int i = 0; i < scaleUsers.size(); i++) { List scaleUserData = measurementDAO.getAll(scaleUsers.get(i).getId()); - float lastWeight = 0; + float lastWeight; if (scaleUserData.size() > 0) { lastWeight = scaleUserData.get(0).getWeight(); diff --git a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMiScale.java b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMiScale.java index c5e02178..3c93fc35 100644 --- a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMiScale.java +++ b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMiScale.java @@ -196,8 +196,6 @@ public class BluetoothMiScale extends BluetoothCommunication { private void parseBytes(byte[] weightBytes) { try { - float weight = 0.0f; - final byte ctrlByte = weightBytes[0]; final boolean isWeightRemoved = isBitSet(ctrlByte, 7); @@ -224,6 +222,7 @@ public class BluetoothMiScale extends BluetoothCommunication { final int min = (int) weightBytes[8]; final int sec = (int) weightBytes[9]; + float weight; if (isLBSUnit || isCattyUnit) { weight = (float) (((weightBytes[2] & 0xFF) << 8) | (weightBytes[1] & 0xFF)) / 100.0f; } else { diff --git a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMiScale2.java b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMiScale2.java index 5e9ad0e3..44950297 100644 --- a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMiScale2.java +++ b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMiScale2.java @@ -175,8 +175,6 @@ public class BluetoothMiScale2 extends BluetoothCommunication { private void parseBytes(byte[] weightBytes) { try { - float weight = 0.0f; - final byte ctrlByte0 = weightBytes[0]; final byte ctrlByte1 = weightBytes[1]; @@ -195,6 +193,7 @@ public class BluetoothMiScale2 extends BluetoothCommunication { final int min = (int) weightBytes[7]; final int sec = (int) weightBytes[8]; + float weight; if (isLBSUnit || isCattyUnit) { weight = (float) (((weightBytes[12] & 0xFF) << 8) | (weightBytes[11] & 0xFF)) / 100.0f; } else { diff --git a/android_app/app/src/main/java/com/health/openscale/core/datatypes/ScaleMeasurement.java b/android_app/app/src/main/java/com/health/openscale/core/datatypes/ScaleMeasurement.java index e6d88989..c09e9aec 100644 --- a/android_app/app/src/main/java/com/health/openscale/core/datatypes/ScaleMeasurement.java +++ b/android_app/app/src/main/java/com/health/openscale/core/datatypes/ScaleMeasurement.java @@ -272,7 +272,7 @@ public class ScaleMeasurement implements Cloneable { } public float getBMR(ScaleUser scaleUser) { - float bmr = 0.0f; + float bmr; // BMR formula by Mifflin, St Jeor et al: A new predictive equation for resting energy expenditure in healthy individuals if (scaleUser.getGender().isMale()) { diff --git a/android_app/app/src/main/java/com/health/openscale/core/evaluation/EvaluationResult.java b/android_app/app/src/main/java/com/health/openscale/core/evaluation/EvaluationResult.java index 3fb385b0..0470217e 100644 --- a/android_app/app/src/main/java/com/health/openscale/core/evaluation/EvaluationResult.java +++ b/android_app/app/src/main/java/com/health/openscale/core/evaluation/EvaluationResult.java @@ -24,13 +24,6 @@ public class EvaluationResult { public float highLimit; public EVAL_STATE eval_state; - public EvaluationResult() { - this.value = -1.0f; - this.lowLimit = -1.0f; - this.highLimit = -1.0f; - this.eval_state = EVAL_STATE.UNDEFINED; - } - public EvaluationResult(float value, float lowLimit, float highLimit, EVAL_STATE eval_state) { this.value = value; @@ -38,5 +31,4 @@ public class EvaluationResult { this.highLimit = highLimit; this.eval_state = eval_state; } - } diff --git a/android_app/app/src/main/java/com/health/openscale/core/evaluation/EvaluationSheet.java b/android_app/app/src/main/java/com/health/openscale/core/evaluation/EvaluationSheet.java index 3c74825c..ed20ca17 100644 --- a/android_app/app/src/main/java/com/health/openscale/core/evaluation/EvaluationSheet.java +++ b/android_app/app/src/main/java/com/health/openscale/core/evaluation/EvaluationSheet.java @@ -168,8 +168,8 @@ public class EvaluationSheet { public EvaluationResult evaluateWeight(float weight) { float body_height_squared = (evalUser.getBodyHeight() / 100.0f) * (evalUser.getBodyHeight() / 100.0f); - float lowLimit = 0.0f; - float highLimit = 0.0f; + float lowLimit; + float highLimit; if (evalUser.getGender().isMale()) { lowLimit = body_height_squared * 20.0f; diff --git a/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java b/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java index 3c2bd551..a88f1055 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java @@ -46,7 +46,6 @@ import android.support.v7.widget.Toolbar; import android.util.Log; import android.view.Menu; import android.view.MenuItem; -import android.view.View; import android.widget.Toast; import com.health.openscale.BuildConfig; diff --git a/android_app/app/src/main/java/com/health/openscale/gui/fragments/TableFragment.java b/android_app/app/src/main/java/com/health/openscale/gui/fragments/TableFragment.java index 8c97d678..ed993b8b 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/fragments/TableFragment.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/fragments/TableFragment.java @@ -242,8 +242,6 @@ public class TableFragment extends Fragment implements FragmentUpdateListener { private Spanned[][] stringCache; - private ArrayList> dataList; - public void setMeasurements(List visibleMeasurements, List scaleMeasurements, int maxSize) { diff --git a/android_app/app/src/main/java/com/health/openscale/gui/preferences/GeneralPreferences.java b/android_app/app/src/main/java/com/health/openscale/gui/preferences/GeneralPreferences.java index 51af6c7b..56638138 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/preferences/GeneralPreferences.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/preferences/GeneralPreferences.java @@ -31,8 +31,6 @@ import java.util.List; import java.util.Set; public class GeneralPreferences extends PreferenceFragment implements SharedPreferences.OnSharedPreferenceChangeListener { - private static final String PREFERENCE_KEY_APP_THEME = "app_theme"; - @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState);