From 2699d63a51233eb191c2cfe323550a0acaaf7ad9 Mon Sep 17 00:00:00 2001
From: Erik Johansson <erik@ejohansson.se>
Date: Sat, 7 Apr 2018 20:53:06 +0200
Subject: [PATCH] Minor cleanup

---
 .../core/bluetooth/BluetoothBeurerBF700_800.java     | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothBeurerBF700_800.java b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothBeurerBF700_800.java
index 7c398954..9b10170f 100644
--- a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothBeurerBF700_800.java
+++ b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothBeurerBF700_800.java
@@ -203,7 +203,7 @@ public class BluetoothBeurerBF700_800 extends BluetoothCommunication {
                     final ScaleUser selectedUser = OpenScale.getInstance(context).getSelectedScaleUser();
 
                     // We can only use up to 3 characters and have to handle them uppercase
-                    int maxIdx = selectedUser.getUserName().length() >= 3 ? 3 : selectedUser.getUserName().length();
+                    int maxIdx = Math.min(3, selectedUser.getUserName().length());
                     byte[] nick = selectedUser.getUserName().toUpperCase().substring(0, maxIdx).getBytes();
 
                     byte activity = 2; // activity level: 1 - 5
@@ -231,8 +231,6 @@ public class BluetoothBeurerBF700_800 extends BluetoothCommunication {
                 }
                 Log.d(TAG, "scaleuserid:" + currentScaleUserId + " registered users: " + countRegisteredScaleUsers +
                         " extracted users: " + seenUsers.size());
-
-
                 break;
             case 6:
                 break;
@@ -241,7 +239,6 @@ public class BluetoothBeurerBF700_800 extends BluetoothCommunication {
                 return false;
         }
 
-
         return true;
     }
 
@@ -308,8 +305,9 @@ public class BluetoothBeurerBF700_800 extends BluetoothCommunication {
 
             countRegisteredScaleUsers = count;
             // Check if any scale user is registered
-            if (count == 0)
+            if (count == 0) {
                 currentScaleUserId = 0; // Unknown user
+            }
             maxRegisteredScaleUser = maxUsers;
 
             nextMachineStateStep();
@@ -388,8 +386,8 @@ public class BluetoothBeurerBF700_800 extends BluetoothCommunication {
 
             Log.d(TAG, "BatteryLevel:" + batteryLevel + " weightThreshold: " + weightThreshold +
                     " BodyFatThresh: " + bodyFatThreshold + " Unit: " + unit + " userExists: " + userExists +
-                    " UserReference Weight Exists:" + userReferWeightExists + " UserMeasurementExists " + userMeasurementExist +
-                    " scaleVersion" + scaleVersion);
+                    " UserReference Weight Exists: " + userReferWeightExists + " UserMeasurementExists: " + userMeasurementExist +
+                    " scaleVersion: " + scaleVersion);
             return;
         }