From 4a839f56bb8fe4d886302f0bfad3b91f8ecb4695 Mon Sep 17 00:00:00 2001
From: OliE <olie.xdev@googlemail.com>
Date: Sat, 29 Apr 2017 13:27:50 +0200
Subject: [PATCH] fix small bug

---
 .../main/java/com/health/openscale/core/OpenScale.java    | 8 +++-----
 .../com/health/openscale/core/database/ScaleDatabase.java | 1 +
 2 files changed, 4 insertions(+), 5 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 a833950d..efe50920 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
@@ -46,8 +46,6 @@ import java.util.ArrayList;
 import java.util.Map;
 import java.util.TreeMap;
 
-import static android.R.attr.id;
-import static com.health.openscale.R.drawable.weight;
 import static com.health.openscale.core.bluetooth.BluetoothCommunication.BT_MI_SCALE;
 import static com.health.openscale.core.bluetooth.BluetoothCommunication.BT_OPEN_SCALE;
 
@@ -174,7 +172,7 @@ public class OpenScale {
 
         if (scaleData.getUserId() == -1) {
             if (prefs.getBoolean("smartUserAssign", false)) {
-                scaleData.setUserId(getSmartUserAssignment(weight, 15.0f));
+                scaleData.setUserId(getSmartUserAssignment(scaleData.getWeight(), 15.0f));
             } else {
                 scaleData.setUserId(getSelectedScaleUser().id);
             }
@@ -200,7 +198,7 @@ public class OpenScale {
             ArrayList<ScaleData> scaleUserData = scaleDB.getScaleDataList(scaleUser.get(i).id);
 
             if (scaleUserData.size() > 0) {
-                float lastWeight = scaleUserData.get(0).getConvertedWeight(getSelectedScaleUser().scale_unit);
+                float lastWeight = scaleUserData.get(0).getWeight();
 
                 if ((lastWeight - range) <= weight && (lastWeight + range) >= weight) {
                     inRangeWeights.put(Math.abs(lastWeight - weight), scaleUser.get(i).id);
@@ -217,7 +215,7 @@ public class OpenScale {
     }
 
     public void updateScaleData(ScaleData scaleData) {
-        scaleDB.updateEntry(id, scaleData);
+        scaleDB.updateEntry(scaleData.getId(), scaleData);
         alarmHandler.entryChanged(context, scaleData);
 
         updateScaleData();
diff --git a/android_app/app/src/main/java/com/health/openscale/core/database/ScaleDatabase.java b/android_app/app/src/main/java/com/health/openscale/core/database/ScaleDatabase.java
index 9ec12cb4..904a42d0 100644
--- a/android_app/app/src/main/java/com/health/openscale/core/database/ScaleDatabase.java
+++ b/android_app/app/src/main/java/com/health/openscale/core/database/ScaleDatabase.java
@@ -158,6 +158,7 @@ public class ScaleDatabase extends SQLiteOpenHelper {
 
     public void updateEntry(long id, ScaleData scaleData) {
         ContentValues values = new ContentValues();
+
         values.put(COLUMN_NAME_DATE_TIME, formatDateTime.format(scaleData.getDateTime()));
         values.put(COLUMN_NAME_WEIGHT, scaleData.getWeight());
         values.put(COLUMN_NAME_FAT, scaleData.getFat());