caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

allow ISO format with miliseconds

Browse source
This commit is contained in:
Milos Kozak 2017-07-02 12:49:25 +02:00
parent 771ff0d781
commit e0e0a75519
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/info/nightscout/utils/DateUtil.java
View file

@ -3,6 +3,7 @@ package info.nightscout.utils;
import android.text.format.DateUtils;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
@ -24,6 +25,7 @@ public class DateUtil {
* The date format in iso.
*/
public static String FORMAT_DATE_ISO = "yyyy-MM-dd'T'HH:mm:ss'Z'";
public static String FORMAT_DATE_ISO_MSEC = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
/**
* Takes in an ISO date string of the following format:
@ -36,8 +38,15 @@ public class DateUtil {
public static Date fromISODateString(String isoDateString)
throws Exception {
SimpleDateFormat f = new SimpleDateFormat(FORMAT_DATE_ISO);
Date date;
f.setTimeZone(TimeZone.getTimeZone("UTC"));
Date date = f.parse(isoDateString);
try {
date = f.parse(isoDateString);
} catch (ParseException e) {
f = new SimpleDateFormat(FORMAT_DATE_ISO_MSEC);
f.setTimeZone(TimeZone.getTimeZone("UTC"));
date = f.parse(isoDateString);
}
return date;
}