karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Add Locale.US for all SimpleDateFormat constructor.

Browse Source
This commit is contained in:
Jimmy Shih
2013-01-31 11:22:20 -08:00
parent 71900213c0
commit ccd4398e4b
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/io/backup/ExternalFileBackup.java
+3 -2
View File
@@ -40,6 +40,7 @@ import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.TimeZone; import java.util.TimeZone;
import java.util.zip.ZipEntry; import java.util.zip.ZipEntry;
import java.util.zip.ZipFile; import java.util.zip.ZipFile;
@@ -52,8 +53,8 @@ import java.util.zip.ZipOutputStream;
*/ */
class ExternalFileBackup { class ExternalFileBackup {
// Filename format - in UTC // Filename format - in UTC
private static final SimpleDateFormat BACKUP_FILENAME_FORMAT = private static final SimpleDateFormat BACKUP_FILENAME_FORMAT = new SimpleDateFormat(
new SimpleDateFormat("'backup-'yyyy-MM-dd_HH-mm-ss'.zip'"); "'backup-'yyyy-MM-dd_HH-mm-ss'.zip'", Locale.US);
static { static {
BACKUP_FILENAME_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC")); BACKUP_FILENAME_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC"));
} }
MyTracksTest/src/com/google/android/apps/mytracks/util/TrackNameUtilsTest.java
+3 -1
View File
@@ -22,6 +22,7 @@ import android.test.AndroidTestCase;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import java.util.Locale;
/** /**
* Tests {@link TrackNameUtils}. * Tests {@link TrackNameUtils}.
@@ -51,7 +52,8 @@ public class TrackNameUtilsTest extends AndroidTestCase {
public void testTrackName_date_iso_8601() { public void testTrackName_date_iso_8601() {
PreferencesUtils.setString(getContext(), R.string.track_name_key, PreferencesUtils.setString(getContext(), R.string.track_name_key,
getContext().getString(R.string.settings_recording_track_name_date_iso_8601_value)); getContext().getString(R.string.settings_recording_track_name_date_iso_8601_value));
SimpleDateFormat simpleDateFormat = new SimpleDateFormat(TrackNameUtils.ISO_8601_FORMAT); SimpleDateFormat simpleDateFormat = new SimpleDateFormat(
TrackNameUtils.ISO_8601_FORMAT, Locale.US);
assertEquals(simpleDateFormat.format(new Date(START_TIME)), assertEquals(simpleDateFormat.format(new Date(START_TIME)),
TrackNameUtils.getTrackName(getContext(), TRACK_ID, START_TIME, null)); TrackNameUtils.getTrackName(getContext(), TRACK_ID, START_TIME, null));
} }