Fix CSV export in some locales; bump version to 1.7.11 (38)

omsitapara23 · Aug 10, 2019 · 957a5b7 · 957a5b7
1 parent 64cc9f7
commit 957a5b7
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+### 1.7.11 (Aug 10, 2019)
+
+* Fix bug that produced corrupted CSV files in some countries
+
 ### 1.7.10 (June 15, 2019)
 
 * Fix bug that prevented some devices from showing notifications.

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -21,8 +21,8 @@
 <manifest
     package="org.isoron.uhabits"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:versionCode="37"
-    android:versionName="1.7.10">
+    android:versionCode="38"
+    android:versionName="1.7.11">
 
     <uses-permission android:name="android.permission.VIBRATE"/>
 

diff --git a/app/src/main/java/org/isoron/uhabits/io/HabitsCSVExporter.java b/app/src/main/java/org/isoron/uhabits/io/HabitsCSVExporter.java
@@ -119,7 +119,7 @@ private void writeHabits() throws IOException
         {
             String sane = sanitizeFilename(h.getName());
             String habitDirName =
-                String.format("%03d %s", allHabits.indexOf(h) + 1, sane);
+                String.format(Locale.US, "%03d %s", allHabits.indexOf(h) + 1, sane);
             habitDirName = habitDirName.trim() + "/";
 
             new File(exportDirName + habitDirName).mkdirs();
@@ -202,7 +202,7 @@ private void writeMultipleHabits() throws IOException
                 checksWriter.write(String.valueOf(checkmarks.get(j)[i]));
                 checksWriter.write(DELIMITER);
                 String score =
-                        String.format("%.4f", ((float) scores.get(j)[i]) / Score.MAX_VALUE);
+                        String.format(Locale.US, "%.4f", ((float) scores.get(j)[i]) / Score.MAX_VALUE);
                 scoresWriter.write(score);
                 scoresWriter.write(DELIMITER);
             }

diff --git a/app/src/main/java/org/isoron/uhabits/models/ScoreList.java b/app/src/main/java/org/isoron/uhabits/models/ScoreList.java
@@ -173,7 +173,7 @@ public void writeCSV(Writer out) throws IOException
         {
             String timestamp = dateFormat.format(s.getTimestamp());
             String score =
-                String.format("%.4f", ((float) s.getValue()) / Score.MAX_VALUE);
+                String.format(Locale.US, "%.4f", ((float) s.getValue()) / Score.MAX_VALUE);
             out.write(String.format("%s,%s\n", timestamp, score));
         }
     }