From 946414a76024eec382a2019e200815421e45719a Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Wed, 19 Sep 2012 12:33:50 +0200 Subject: [PATCH] work around http://code.google.com/p/android/issues/detail?id=21425 --- enabler/src/de/schildbach/pte/AbstractEfaProvider.java | 3 ++- enabler/src/de/schildbach/pte/util/XmlPullUtil.java | 10 +++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java index d0dade04..452498a6 100644 --- a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java +++ b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java @@ -1889,7 +1889,8 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider XmlPullUtil.enter(pp, "itdDate"); if (XmlPullUtil.test(pp, "itdMessage")) { - final String message = pp.nextText(); + final String message = XmlPullUtil.nextText(pp, null, "itdMessage"); + if ("invalid date".equals(message)) return new QueryConnectionsResult(header, QueryConnectionsResult.Status.INVALID_DATE); else diff --git a/enabler/src/de/schildbach/pte/util/XmlPullUtil.java b/enabler/src/de/schildbach/pte/util/XmlPullUtil.java index bfd0f765..f7605e99 100644 --- a/enabler/src/de/schildbach/pte/util/XmlPullUtil.java +++ b/enabler/src/de/schildbach/pte/util/XmlPullUtil.java @@ -301,7 +301,15 @@ public final class XmlPullUtil throw new XmlPullParserException("name for element can not be null"); pp.require(XmlPullParser.START_TAG, namespace, name); - return pp.nextText(); + final String text = pp.nextText(); + + // work around http://code.google.com/p/android/issues/detail?id=21425 + if (pp.getEventType() != XmlPullParser.END_TAG) + pp.nextTag(); + + pp.require(XmlPullParser.END_TAG, namespace, name); + + return text; } /**