From 38b1649dd512d7e6ed346f79bf2a5883a8d8787a Mon Sep 17 00:00:00 2001
From: Erik Johansson <erik@ejohansson.se>
Date: Tue, 20 Nov 2018 19:28:15 +0100
Subject: [PATCH] Minor cleanup for #352

---
 .../core/bluetooth/BluetoothInlife.java       | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothInlife.java b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothInlife.java
index 674002be..f7d1571c 100644
--- a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothInlife.java
+++ b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothInlife.java
@@ -40,16 +40,16 @@ public class BluetoothInlife extends BluetoothCommunication {
 
     private byte[] lastData = null;
 
-    private int getActivityLevel(ScaleUser scaleUser) {
+    private int getAthleteLevel(ScaleUser scaleUser) {
         switch (scaleUser.getActivityLevel()) {
             case SEDENTARY:
             case MILD:
-                break;
+                return 0; // General
             case MODERATE:
-                return 1;
+                return 1; // Amateur
             case HEAVY:
             case EXTREME:
-                return 2;
+                return 2; // Profession
         }
         return 0;
     }
@@ -83,7 +83,7 @@ public class BluetoothInlife extends BluetoothCommunication {
                 break;
             case 1:
                 ScaleUser scaleUser = OpenScale.getInstance().getSelectedScaleUser();
-                byte level = (byte)(getActivityLevel(scaleUser) + 1);
+                byte level = (byte)(getAthleteLevel(scaleUser) + 1);
                 byte sex = (byte)scaleUser.getGender().toInt();
                 byte userId = (byte)scaleUser.getId();
                 byte age = (byte)scaleUser.getAge();
@@ -117,12 +117,12 @@ public class BluetoothInlife extends BluetoothCommunication {
         }
 
         if (data[0] != START_BYTE || data[data.length - 1] != END_BYTE) {
-            Timber.d("Wrong start or end byte");
+            Timber.e("Wrong start or end byte");
             return;
         }
 
         if (xorChecksum(data, 1, data.length - 2) != 0) {
-            Timber.d("Invalid checksum");
+            Timber.e("Invalid checksum");
             return;
         }
 
@@ -162,7 +162,7 @@ public class BluetoothInlife extends BluetoothCommunication {
                 weight, lbm, visceralFactor, bmr);
 
         final ScaleUser selectedUser = OpenScale.getInstance().getSelectedScaleUser();
-        switch (getActivityLevel(selectedUser)) {
+        switch (getAthleteLevel(selectedUser)) {
             case 0:
                 break;
             case 1:
@@ -198,14 +198,14 @@ public class BluetoothInlife extends BluetoothCommunication {
             }
         }
 
-        if (getActivityLevel(selectedUser) != 0) {
+        if (getAthleteLevel(selectedUser) != 0) {
             if (visceral >= 21) {
                 visceral *= 0.85;
             }
             if (visceral >= 10) {
                 visceral *= 0.8;
             }
-            visceral -= getActivityLevel(selectedUser) * 2;
+            visceral -= getAthleteLevel(selectedUser) * 2;
         }
 
         ScaleMeasurement measurement = new ScaleMeasurement();