mirrors/public-transport-enabler
1
0
Fork 0
mirror of https://gitlab.com/oeffi/public-transport-enabler.git synced 2025-07-10 14:48:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed tz conversion of server time

Browse source 
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@785 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach@gmail.com 2011-09-18 12:33:05 +00:00
parent 3ad37d8dcf
commit 246b6e1b48
1 changed files with 5 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/de/schildbach/pte/AbstractEfaProvider.java
View file

@ -20,7 +20,6 @@ package de.schildbach.pte;
import java.io.IOException;
import java.io.InputStream;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
@ -2156,21 +2155,14 @@ public abstract class AbstractEfaProvider implements NetworkProvider
XmlPullUtil.require(pp, "itdRequest");
final String serverVersion = XmlPullUtil.attr(pp, "version");
final String now = XmlPullUtil.attr(pp, "now") + " " + timeZone().getDisplayName(true, TimeZone.SHORT);
final String now = XmlPullUtil.attr(pp, "now");
final String sessionId = XmlPullUtil.attr(pp, "sessionID");
final DateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss z");
long serverTime = 0;
try
{
serverTime = format.parse(now).getTime();
}
catch (final ParseException x)
{
System.out.println("cannot parse time: '" + now + "'");
}
final Calendar serverTime = new GregorianCalendar(timeZone());
ParserUtils.parseIsoDate(serverTime, now.substring(0, 10));
ParserUtils.parseEuropeanTime(serverTime, now.substring(11));
final ResultHeader header = new ResultHeader(SERVER_PRODUCT, serverVersion, serverTime, sessionId);
final ResultHeader header = new ResultHeader(SERVER_PRODUCT, serverVersion, serverTime.getTimeInMillis(), sessionId);
XmlPullUtil.enter(pp, "itdRequest");