Skip to content

Commit 3daba0a

Browse files
committed
fix: date parsing
1 parent 468b6c3 commit 3daba0a

File tree

1 file changed

+10
-3
lines changed
  • MobileBuy/buy3/src/main/java/com/shopify/buy3

1 file changed

+10
-3
lines changed

MobileBuy/buy3/src/main/java/com/shopify/buy3/Utils.java

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,25 @@
2626

2727
import java.text.ParseException;
2828
import java.text.SimpleDateFormat;
29+
import java.time.Instant;
2930
import java.util.Date;
3031
import java.util.Locale;
3132

3233
final class Utils {
3334
private static final SimpleDateFormat DATE_TIME_FORMATTER = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ", Locale.US);
3435

3536
static Date parseDateTime(String dateTime) {
36-
try {
37+
try {
38+
Instant instant = Instant.parse(dateTime);
39+
return Date.from(instant);
40+
} catch(Exception e1) {
41+
// Fallback to legacy parsing in case of exception
42+
try {
3743
return DATE_TIME_FORMATTER.parse(dateTime);
38-
} catch (ParseException e) {
44+
} catch (ParseException e2) {
3945
return new Date();
40-
}
46+
}
47+
}
4148
}
4249

4350
private Utils() {

0 commit comments

Comments
 (0)