From d63dc843ebf1c29faf399c5dedc0998ee0be19c7 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sat, 18 Jan 2014 12:53:27 +0100 Subject: [PATCH] Fix skipping some trip elements. --- enabler/src/de/schildbach/pte/AbstractEfaProvider.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java index 03236d77..c5384bad 100644 --- a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java +++ b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java @@ -2417,8 +2417,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider XmlPullUtil.exit(pp, "itdDateTime"); XmlPullUtil.exit(pp, "itdTripDateTime"); - XmlPullUtil.enter(pp, "itdTripOptions"); - XmlPullUtil.exit(pp, "itdTripOptions"); + XmlPullUtil.requireSkip(pp, "itdTripOptions"); final List trips = new ArrayList(); @@ -2621,10 +2620,9 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider } } - if (XmlPullUtil.test(pp, "itdFootPathInfo")) - XmlPullUtil.next(pp); - if (XmlPullUtil.test(pp, "infoLink")) - XmlPullUtil.next(pp); + XmlPullUtil.optSkip(pp, "itdFootPathInfo"); + + XmlPullUtil.optSkip(pp, "infoLink"); List intermediateStops = null; if (XmlPullUtil.test(pp, "itdStopSeq"))