From e2500b9a07a7f1904c85bd7801128c2cb72fddf7 Mon Sep 17 00:00:00 2001 From: OliE Date: Wed, 21 Dec 2016 10:17:44 +0100 Subject: [PATCH] update only scale data only if its not a duplicate entry --- .../src/main/java/com/health/openscale/core/OpenScale.java | 6 +++--- .../main/java/com/health/openscale/core/ScaleDatabase.java | 4 +++- 2 files changed, 6 insertions(+), 4 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 4fc835d7..f8f17390 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 @@ -177,9 +177,9 @@ public class OpenScale { Log.e("OpenScale", "Can't parse date time string while adding to the database"); } - scaleDB.insertEntry(scaleData); - - updateScaleData(); + if (scaleDB.insertEntry(scaleData)) { + updateScaleData(); + } } public void updateScaleData(long id, String date_time, float weight, float fat, float water, float muscle, float waist, float hip, String comment) { diff --git a/android_app/app/src/main/java/com/health/openscale/core/ScaleDatabase.java b/android_app/app/src/main/java/com/health/openscale/core/ScaleDatabase.java index fe6beea8..5bd6b70d 100644 --- a/android_app/app/src/main/java/com/health/openscale/core/ScaleDatabase.java +++ b/android_app/app/src/main/java/com/health/openscale/core/ScaleDatabase.java @@ -113,8 +113,9 @@ public class ScaleDatabase extends SQLiteOpenHelper { Cursor cursorScaleDB = db.query(TABLE_NAME, new String[] {COLUMN_NAME_DATE_TIME}, COLUMN_NAME_DATE_TIME + "=? AND " + COLUMN_NAME_USER_ID + "=?", new String[] {formatDateTime.format(scaleData.date_time), Integer.toString(scaleData.user_id)}, null, null, null); + // we don't want double entries if (cursorScaleDB.getCount() > 0) { - // we don't want double entries + cursorScaleDB.close(); return false; } else { ContentValues values = new ContentValues(); @@ -135,6 +136,7 @@ public class ScaleDatabase extends SQLiteOpenHelper { catch (SQLException e) { Log.e("ScaleDatabase", "An error occured while inserting a new entry into the scale database: " + e.toString()); + cursorScaleDB.close(); return false; } }