Fixed parsing of meal input in calculator

Faltenreich · Jan 7, 2017 · bae627a · bae627a
1 parent f058ddd
commit bae627a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/Diaguard/src/main/AndroidManifest.xml b/Diaguard/src/main/AndroidManifest.xml
@@ -3,7 +3,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.faltenreich.diaguard"
-    android:versionCode="12"
+    android:versionCode="13"
     android:versionName="@string/app_version">
 
     <uses-permission android:name="android.permission.INTERNET" />

diff --git a/Diaguard/src/main/java/com/faltenreich/diaguard/ui/fragment/CalculatorFragment.java b/Diaguard/src/main/java/com/faltenreich/diaguard/ui/fragment/CalculatorFragment.java
@@ -284,9 +284,7 @@ private void storeValues(float mgDl, float carbohydrates, float bolus, float cor
 
         if (carbohydrates > 0) {
             Meal meal = new Meal();
-            meal.setCarbohydrates(PreferenceHelper.getInstance().formatCustomToDefaultUnit(
-                    Measurement.Category.MEAL,
-                    foodInputView.getInputCarbohydrates()));
+            meal.setCarbohydrates(foodInputView.getInputCarbohydrates());
             meal.setEntry(entry);
             MeasurementDao.getInstance(Meal.class).createOrUpdate(meal);
 

diff --git a/Diaguard/src/main/res/values/strings.xml b/Diaguard/src/main/res/values/strings.xml
@@ -8,7 +8,7 @@
     <string name="app_homepage_short" translatable="false">diaguard.wordpress.com</string>
     <string name="app_mail" translatable="false">mailto:diaguard.de@gmail.com</string>
     <string name="app_mail_short" translatable="false">diaguard.de@gmail.com</string>
-    <string name="app_version" translatable="false">2.1</string>
+    <string name="app_version" translatable="false">2.1.1</string>
 
     <!-- PREFERENCES -->
     <string name="pref_factor" translatable="false">pref_factor</string>