diff --git a/src/de/schildbach/pte/OebbProvider.java b/src/de/schildbach/pte/OebbProvider.java index b34bcdfa..a099428f 100644 --- a/src/de/schildbach/pte/OebbProvider.java +++ b/src/de/schildbach/pte/OebbProvider.java @@ -347,11 +347,9 @@ public class OebbProvider implements NetworkProvider final String departure = ParserUtils.resolveEntities(mDetFine.group(2)); - Date detailsDepartureDate = mDetFine.group(3) != null ? ParserUtils.parseDate(mDetFine.group(3)) : null; + Date detailsDepartureDate = mDetFine.group(3) != null ? ParserUtils.parseDate(mDetFine.group(3)) : lastDate; if (detailsDepartureDate != null) lastDate = detailsDepartureDate; - else - detailsDepartureDate = lastDate; final Date detailsDepartureTime = ParserUtils.parseTime(mDetFine.group(4)); final Date detailsDepartureDateTime = ParserUtils.joinDateTime(detailsDepartureDate, detailsDepartureTime); @@ -362,11 +360,9 @@ public class OebbProvider implements NetworkProvider final String arrival = ParserUtils.resolveEntities(mDetFine.group(9)); - Date detailsArrivalDate = mDetFine.group(10) != null ? ParserUtils.parseDate(mDetFine.group(10)) : null; + Date detailsArrivalDate = mDetFine.group(10) != null ? ParserUtils.parseDate(mDetFine.group(10)) : lastDate; if (detailsArrivalDate != null) lastDate = detailsArrivalDate; - else - detailsArrivalDate = lastDate; final Date detailsArrivalTime = ParserUtils.parseTime(mDetFine.group(11)); final Date detailsArrivalDateTime = ParserUtils.joinDateTime(detailsArrivalDate, detailsArrivalTime); diff --git a/src/de/schildbach/pte/SbbProvider.java b/src/de/schildbach/pte/SbbProvider.java index 8264edae..e23d736a 100644 --- a/src/de/schildbach/pte/SbbProvider.java +++ b/src/de/schildbach/pte/SbbProvider.java @@ -344,11 +344,9 @@ public class SbbProvider implements NetworkProvider final String departure = ParserUtils.resolveEntities(mDetFine.group(2)); - Date departureDate = mDetFine.group(3) != null ? ParserUtils.parseDate(mDetFine.group(3)) : null; + Date departureDate = mDetFine.group(3) != null ? ParserUtils.parseDate(mDetFine.group(3)) : lastDate; if (departureDate != null) lastDate = departureDate; - else - departureDate = lastDate; final String lineType = mDetFine.group(6); @@ -356,11 +354,9 @@ public class SbbProvider implements NetworkProvider final String arrival = ParserUtils.resolveEntities(mDetFine.group(10)); - Date arrivalDate = mDetFine.group(11) != null ? ParserUtils.parseDate(mDetFine.group(11)) : null; + Date arrivalDate = mDetFine.group(11) != null ? ParserUtils.parseDate(mDetFine.group(11)) : lastDate; if (arrivalDate != null) lastDate = arrivalDate; - else - arrivalDate = lastDate; if (!lineType.equals("fuss") && !lineType.equals("transfer")) {