mirrors/public-transport-enabler
1
0
Fork 0
mirror of https://gitlab.com/oeffi/public-transport-enabler.git synced 2025-07-13 16:20:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

AbstractEfaProvider: Parse error message from mobile results.

Browse source
This commit is contained in:
Andreas Schildbach 2018-12-23 02:53:25 +01:00
parent 99de34026e
commit 607c3c2b91
1 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

27
enabler/src/de/schildbach/pte/AbstractEfaProvider.java
View file

@ -3073,20 +3073,25 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
XmlPullUtil.enter(pp, "efa"); XmlPullUtil.enter(pp, "efa");
final String now = XmlPullUtil.valueTag(pp, "now"); if (XmlPullUtil.test(pp, "error")) {
final Calendar serverTime = new GregorianCalendar(timeZone); final String message = XmlPullUtil.valueTag(pp, "error");
ParserUtils.parseIsoDate(serverTime, now.substring(0, 10)); throw new RuntimeException(message);
ParserUtils.parseEuropeanTime(serverTime, now.substring(11)); } else {
final String now = XmlPullUtil.valueTag(pp, "now");
final Calendar serverTime = new GregorianCalendar(timeZone);
ParserUtils.parseIsoDate(serverTime, now.substring(0, 10));
ParserUtils.parseEuropeanTime(serverTime, now.substring(11));
final Map<String, String> params = processPas(pp); final Map<String, String> params = processPas(pp);
final String requestId = params.get("requestID"); final String requestId = params.get("requestID");
final String sessionId = params.get("sessionID"); final String sessionId = params.get("sessionID");
final String serverId = params.get("serverID"); final String serverId = params.get("serverID");
final ResultHeader header = new ResultHeader(network, SERVER_PRODUCT, null, serverId, final ResultHeader header = new ResultHeader(network, SERVER_PRODUCT, null, serverId,
serverTime.getTimeInMillis(), new String[] { sessionId, requestId }); serverTime.getTimeInMillis(), new String[] { sessionId, requestId });
return header; return header;
}
} }
private Map<String, String> processPas(final XmlPullParser pp) throws XmlPullParserException, IOException { private Map<String, String> processPas(final XmlPullParser pp) throws XmlPullParserException, IOException {