From 27220c9ab2b185b064d4281a13e667c42bd723b0 Mon Sep 17 00:00:00 2001
From: Alinson Xavier <axavier@uwaterloo.ca>
Date: Fri, 26 Feb 2016 05:17:33 -0500
Subject: [PATCH] Specify locale explicitly

---
 .../android/datetimepicker/time/TimePickerDialog.java    | 2 ++
 app/src/main/java/org/isoron/uhabits/io/CSVExporter.java | 3 ++-
 .../java/org/isoron/uhabits/views/HabitHistoryView.java  | 5 +++--
 .../java/org/isoron/uhabits/views/HabitScoreView.java    | 9 ++++++---
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java b/app/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java
index db3ed7890..e365005f4 100644
--- a/app/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java
+++ b/app/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java
@@ -23,6 +23,7 @@ import java.util.Locale;
 import org.isoron.uhabits.R;
 
 import android.animation.ObjectAnimator;
+import android.annotation.SuppressLint;
 import android.app.ActionBar.LayoutParams;
 import android.app.DialogFragment;
 import android.content.Context;
@@ -132,6 +133,7 @@ public class TimePickerDialog extends DialogFragment implements OnValueSelectedL
         // Empty constructor required for dialog fragment.
     }
 
+    @SuppressLint("Java")
     public TimePickerDialog(Context context, int theme, OnTimeSetListener callback,
             int hourOfDay, int minute, boolean is24HourMode) {
         // Empty constructor required for dialog fragment.
diff --git a/app/src/main/java/org/isoron/uhabits/io/CSVExporter.java b/app/src/main/java/org/isoron/uhabits/io/CSVExporter.java
index 40eaf7d6d..291d351d6 100644
--- a/app/src/main/java/org/isoron/uhabits/io/CSVExporter.java
+++ b/app/src/main/java/org/isoron/uhabits/io/CSVExporter.java
@@ -18,6 +18,7 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Locale;
 import java.util.TimeZone;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
@@ -42,7 +43,7 @@ public class CSVExporter
 
         basePath = String.format("%s/export/", context.getFilesDir());
 
-        dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.US);
         dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
     }
 
diff --git a/app/src/main/java/org/isoron/uhabits/views/HabitHistoryView.java b/app/src/main/java/org/isoron/uhabits/views/HabitHistoryView.java
index 8255f489f..682b63c30 100644
--- a/app/src/main/java/org/isoron/uhabits/views/HabitHistoryView.java
+++ b/app/src/main/java/org/isoron/uhabits/views/HabitHistoryView.java
@@ -30,6 +30,7 @@ import org.isoron.uhabits.models.Habit;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
+import java.util.Locale;
 
 public class HabitHistoryView extends ScrollableDataView
 {
@@ -61,8 +62,8 @@ public class HabitHistoryView extends ScrollableDataView
         createColors();
 
         wdays = DateHelper.getShortDayNames();
-        dfMonth = new SimpleDateFormat("MMM");
-        dfYear = new SimpleDateFormat("yyyy");
+        dfMonth = new SimpleDateFormat("MMM", Locale.getDefault());
+        dfYear = new SimpleDateFormat("yyyy", Locale.getDefault());
     }
 
     private void updateDate()
diff --git a/app/src/main/java/org/isoron/uhabits/views/HabitScoreView.java b/app/src/main/java/org/isoron/uhabits/views/HabitScoreView.java
index 054aca4a6..ce50310a7 100644
--- a/app/src/main/java/org/isoron/uhabits/views/HabitScoreView.java
+++ b/app/src/main/java/org/isoron/uhabits/views/HabitScoreView.java
@@ -27,6 +27,7 @@ import org.isoron.helpers.DateHelper;
 import org.isoron.uhabits.models.Habit;
 
 import java.text.SimpleDateFormat;
+import java.util.Locale;
 
 public class HabitScoreView extends ScrollableDataView
 {
@@ -35,6 +36,8 @@ public class HabitScoreView extends ScrollableDataView
     private final Paint pGrid;
     private final float em;
     private Habit habit;
+    private SimpleDateFormat dfMonth;
+    private SimpleDateFormat dfDay;
 
     private Paint pText, pGraph;
 
@@ -76,6 +79,9 @@ public class HabitScoreView extends ScrollableDataView
         colors[3] = habit.color;
         colors[1] = ColorHelper.mixColors(colors[0], colors[3], 0.66f);
         colors[2] = ColorHelper.mixColors(colors[0], colors[3], 0.33f);
+
+        dfMonth = new SimpleDateFormat("MMM", Locale.getDefault());
+        dfDay = new SimpleDateFormat("d", Locale.getDefault());
     }
 
     protected void fetchData()
@@ -94,9 +100,6 @@ public class HabitScoreView extends ScrollableDataView
         rGrid.offset(0, headerHeight);
         drawGrid(canvas, rGrid);
 
-        SimpleDateFormat dfMonth = new SimpleDateFormat("MMM");
-        SimpleDateFormat dfDay = new SimpleDateFormat("d");
-
         String previousMonth = "";
 
         pGraph.setColor(habit.color);