Commitef69f4c

committed

Workaround the com.dropbox.core.BadRequestException on devices with locale whose numeric character is non-ascii (dropbox#119)

1 parentce883f4 commitef69f4cCopy full SHA for ef69f4c

File tree

-3

lines changed

-3

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`importjava.text.SimpleDateFormat;`
`6`	`6`	`importjava.util.Date;`
`7`	`7`	`importjava.util.GregorianCalendar;`
	`8`	`+importjava.util.Locale;`
`8`	`9`	`importjava.util.TimeZone;`
`9`	`10`
`10`	`11`	`importcom.fasterxml.jackson.core.JsonFactory;`
`@@ -19,7 +20,7 @@ final class Util {`
`19`	`20`	`privatestaticfinalintSHORT_FORMAT_LENGTH =DATE_FORMAT.replace("'","").length();`
`20`	`21`
`21`	`22`	`publicstaticStringformatTimestamp(Datetimestamp) {`
`22`		`-DateFormatformat =newSimpleDateFormat(DATE_TIME_FORMAT);`
	`23`	`+DateFormatformat =newSimpleDateFormat(DATE_TIME_FORMAT,Locale.ENGLISH);`
`23`	`24`	`format.setCalendar(newGregorianCalendar(UTC));`
`24`	`25`	`returnformat.format(timestamp);`
`25`	`26`	`}`
`@@ -29,9 +30,9 @@ public static Date parseTimestamp(String timestamp) throws ParseException {`
`29`	`30`
`30`	`31`	`DateFormatformat =null;`
`31`	`32`	`if (length ==LONG_FORMAT_LENGTH) {`
`32`		`-format =newSimpleDateFormat(DATE_TIME_FORMAT);`
	`33`	`+format =newSimpleDateFormat(DATE_TIME_FORMAT,Locale.ENGLISH);`
`33`	`34`	`}elseif (length ==SHORT_FORMAT_LENGTH) {`
`34`		`-format =newSimpleDateFormat(DATE_FORMAT);`
	`35`	`+format =newSimpleDateFormat(DATE_FORMAT,Locale.ENGLISH);`
`35`	`36`	`}else {`
`36`	`37`	`thrownewParseException("timestamp has unexpected format: '" +timestamp +"'",0);`
`37`	`38`	`}`

Comments

(0)