From de7789bec010111d52704d174f6aada58d4b757d Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Tue, 23 Jan 2018 21:43:48 +0100 Subject: [PATCH 1/3] delete all dbrequests from query --- .../info/nightscout/androidaps/db/DatabaseHelper.java | 11 ++++------- .../androidaps/plugins/Food/FoodFragment.java | 3 ++- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java index 8613f18ab5..082f872d20 100644 --- a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java +++ b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java @@ -507,7 +507,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper { return 0; } - public int deleteDbRequestbyMongoId(String action, String id) { + public void deleteDbRequestbyMongoId(String action, String id) { try { QueryBuilder queryBuilder = getDaoDbRequest().queryBuilder(); Where where = queryBuilder.where(); @@ -515,16 +515,13 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper { queryBuilder.limit(10L); PreparedQuery preparedQuery = queryBuilder.prepare(); List dbList = getDaoDbRequest().query(preparedQuery); - if (dbList.size() != 1) { - log.error("deleteDbRequestbyMongoId query size: " + dbList.size()); - } else { - //log.debug("Treatment findTreatmentById found: " + trList.get(0).log()); - return delete(dbList.get(0)); + log.error("deleteDbRequestbyMongoId query size: " + dbList.size()); + for (DbRequest r : dbList) { + delete(r); } } catch (SQLException e) { log.error("Unhandled exception", e); } - return 0; } public void deleteAllDbRequests() { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Food/FoodFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Food/FoodFragment.java index 558cf0d02f..99cdcb0301 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Food/FoodFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Food/FoodFragment.java @@ -61,7 +61,7 @@ public class FoodFragment extends SubscriberFragment { Bundle savedInstanceState) { try { View view = inflater.inflate(R.layout.food_fragment, container, false); - +log.debug(">>>>>>> start onCreateView"); filter = (EditText) view.findViewById(R.id.food_filter); clearFilter = (ImageView) view.findViewById(R.id.food_clearfilter); category = new SpinnerHelper(view.findViewById(R.id.food_category)); @@ -129,6 +129,7 @@ public class FoodFragment extends SubscriberFragment { fillCategories(); fillSubcategories(); filterData(); + log.debug(">>>>>>> end onCreateView"); return view; } catch (Exception e) { Crashlytics.logException(e); From 9663dd499e6323c399a18ae8b89d569abaf002fe Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Tue, 23 Jan 2018 23:01:04 +0100 Subject: [PATCH 2/3] remove forgotten log --- .../info/nightscout/androidaps/plugins/Food/FoodFragment.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Food/FoodFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Food/FoodFragment.java index 99cdcb0301..a5c00aab7f 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Food/FoodFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Food/FoodFragment.java @@ -61,7 +61,6 @@ public class FoodFragment extends SubscriberFragment { Bundle savedInstanceState) { try { View view = inflater.inflate(R.layout.food_fragment, container, false); -log.debug(">>>>>>> start onCreateView"); filter = (EditText) view.findViewById(R.id.food_filter); clearFilter = (ImageView) view.findViewById(R.id.food_clearfilter); category = new SpinnerHelper(view.findViewById(R.id.food_category)); @@ -129,7 +128,6 @@ log.debug(">>>>>>> start onCreateView"); fillCategories(); fillSubcategories(); filterData(); - log.debug(">>>>>>> end onCreateView"); return view; } catch (Exception e) { Crashlytics.logException(e); From b6f3fae487344ae517deb408b5c04c4bda9f6d84 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Tue, 23 Jan 2018 23:14:39 +0100 Subject: [PATCH 3/3] fix storing food to the database --- .../info/nightscout/androidaps/db/FoodHelper.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/db/FoodHelper.java b/app/src/main/java/info/nightscout/androidaps/db/FoodHelper.java index 992e328532..a933c2166e 100644 --- a/app/src/main/java/info/nightscout/androidaps/db/FoodHelper.java +++ b/app/src/main/java/info/nightscout/androidaps/db/FoodHelper.java @@ -70,7 +70,7 @@ public class FoodHelper { public boolean createOrUpdate(Food food) { try { // find by NS _id - if (food._id != null) { + if (food._id != null && !food._id.equals("")) { Food old; QueryBuilder queryBuilder = getDaoFood().queryBuilder(); @@ -90,12 +90,13 @@ public class FoodHelper { } else { return false; } + } else { + getDaoFood().createOrUpdate(food); + log.debug("FOOD: New record: " + food.toString()); + scheduleFoodChange(); + return true; } } - getDaoFood().createOrUpdate(food); - log.debug("FOOD: New record: " + food.toString()); - scheduleFoodChange(); - return true; } catch (SQLException e) { log.error("Unhandled exception", e); }