caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge branch 'dev' into cobthread

Browse source
This commit is contained in:
Milos Kozak 2018-01-24 00:00:23 +01:00
parent d4ddfbb942 b6f3fae487
commit 8a45422135
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/info/nightscout/androidaps/db/FoodHelper.java
View file

@ -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<Food, Long> 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);
}

2
app/src/main/java/info/nightscout/androidaps/plugins/Food/FoodFragment.java
View file

@ -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);