mirror of
https://gitlab.com/oeffi/public-transport-enabler.git
synced 2025-07-06 15:18:49 +00:00
DB: replace usage of java.time API with java.text.DateFormat
java.time isn't available until Android 8.
This commit is contained in:
parent
5522113051
commit
03a0929d05
1 changed files with 17 additions and 5 deletions
|
@ -18,8 +18,9 @@
|
||||||
package de.schildbach.pte;
|
package de.schildbach.pte;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.time.Instant;
|
import java.text.DateFormat;
|
||||||
import java.time.format.DateTimeFormatter;
|
import java.text.ParseException;
|
||||||
|
import java.text.SimpleDateFormat;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Calendar;
|
import java.util.Calendar;
|
||||||
|
@ -147,7 +148,7 @@ public final class DbProvider extends AbstractNetworkProvider {
|
||||||
private final HttpUrl locationsEndpoint;
|
private final HttpUrl locationsEndpoint;
|
||||||
private final HttpUrl nearbyEndpoint;
|
private final HttpUrl nearbyEndpoint;
|
||||||
|
|
||||||
private TimeZone timeZone = TimeZone.getTimeZone("CET");
|
private static final TimeZone timeZone = TimeZone.getTimeZone("CET");
|
||||||
|
|
||||||
private static final Pattern P_SPLIT_NAME_FIRST_COMMA = Pattern.compile("([^,]*), (.*)");
|
private static final Pattern P_SPLIT_NAME_FIRST_COMMA = Pattern.compile("([^,]*), (.*)");
|
||||||
private static final Pattern P_SPLIT_NAME_ONE_COMMA = Pattern.compile("([^,]*), ([^,]*)");
|
private static final Pattern P_SPLIT_NAME_ONE_COMMA = Pattern.compile("([^,]*), ([^,]*)");
|
||||||
|
@ -185,16 +186,27 @@ public final class DbProvider extends AbstractNetworkProvider {
|
||||||
return String.format(Locale.ENGLISH, "%02d:%02d", hour, minute);
|
return String.format(Locale.ENGLISH, "%02d:%02d", hour, minute);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static final DateFormat ISO_DATE_TIME_WOFFSET_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX");
|
||||||
|
|
||||||
|
static {
|
||||||
|
ISO_DATE_TIME_WOFFSET_FORMAT.setTimeZone(timeZone);
|
||||||
|
}
|
||||||
|
|
||||||
private String formatIso8601WOffset(final Date time) {
|
private String formatIso8601WOffset(final Date time) {
|
||||||
if (time == null)
|
if (time == null)
|
||||||
return null;
|
return null;
|
||||||
return DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(time.toInstant().atZone(timeZone.toZoneId()));
|
return ISO_DATE_TIME_WOFFSET_FORMAT.format(time);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private Date parseIso8601WOffset(final String time) {
|
private Date parseIso8601WOffset(final String time) {
|
||||||
if (time == null)
|
if (time == null)
|
||||||
return null;
|
return null;
|
||||||
return Date.from(Instant.from(DateTimeFormatter.ISO_OFFSET_DATE_TIME.parse(time)));
|
try {
|
||||||
|
return ISO_DATE_TIME_WOFFSET_FORMAT.parse(time);
|
||||||
|
} catch (final ParseException x) {
|
||||||
|
throw new RuntimeException(x);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private String createLidEntry(final String key, final Object value) {
|
private String createLidEntry(final String key, final Object value) {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue