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

EFA: Make parsing of server time ('now' attribute) optional.

Browse source
This commit is contained in:
Andreas Schildbach 2015-11-16 21:43:07 +01:00
parent f0b33c97e2
commit 8113f8b775
1 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3349,14 +3349,23 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
XmlPullUtil.require(pp, "itdRequest"); XmlPullUtil.require(pp, "itdRequest");
final String serverVersion = XmlPullUtil.attr(pp, "version"); final String serverVersion = XmlPullUtil.attr(pp, "version");
final String now = XmlPullUtil.attr(pp, "now"); final String now = XmlPullUtil.optAttr(pp, "now", null);
final String sessionId = XmlPullUtil.attr(pp, "sessionID"); final String sessionId = XmlPullUtil.attr(pp, "sessionID");
final Calendar serverTime = new GregorianCalendar(timeZone); final long serverTime;
ParserUtils.parseIsoDate(serverTime, now.substring(0, 10)); if (now != null)
ParserUtils.parseEuropeanTime(serverTime, now.substring(11)); {
final Calendar calendar = new GregorianCalendar(timeZone);
ParserUtils.parseIsoDate(calendar, now.substring(0, 10));
ParserUtils.parseEuropeanTime(calendar, now.substring(11));
serverTime = calendar.getTimeInMillis();
}
else
{
serverTime = 0;
}
final ResultHeader header = new ResultHeader(network, SERVER_PRODUCT, serverVersion, serverTime.getTimeInMillis(), sessionId); final ResultHeader header = new ResultHeader(network, SERVER_PRODUCT, serverVersion, serverTime, sessionId);
XmlPullUtil.enter(pp, "itdRequest"); XmlPullUtil.enter(pp, "itdRequest");