diff --git a/src/de/schildbach/pte/AbstractEfaProvider.java b/src/de/schildbach/pte/AbstractEfaProvider.java index b2b705a5..d062ee2a 100644 --- a/src/de/schildbach/pte/AbstractEfaProvider.java +++ b/src/de/schildbach/pte/AbstractEfaProvider.java @@ -1146,10 +1146,11 @@ public abstract class AbstractEfaProvider implements NetworkProvider pp.setInput(is, null); assertItdRequest(pp); - final String sessionId = pp.getAttributeValue(null, "sessionID"); + final String sessionId = XmlPullUtil.attr(pp, "sessionID"); if (!XmlPullUtil.jumpToStartTag(pp, null, "itdTripRequest")) throw new IllegalStateException("cannot find "); + final String requestId = XmlPullUtil.attr(pp, "requestID"); XmlPullUtil.enter(pp, "itdTripRequest"); if (XmlPullUtil.test(pp, "itdMessage")) @@ -1457,7 +1458,7 @@ public abstract class AbstractEfaProvider implements NetworkProvider XmlPullUtil.exit(pp, "itdRouteList"); - return new QueryConnectionsResult(uri, from, via, to, commandLink(sessionId, "tripNext"), connections); + return new QueryConnectionsResult(uri, from, via, to, commandLink(sessionId, requestId, "tripNext"), connections); } else { @@ -1597,7 +1598,7 @@ public abstract class AbstractEfaProvider implements NetworkProvider protected abstract String connectionsQueryUri(Location from, Location via, Location to, Date date, boolean dep, String products, WalkSpeed walkSpeed); - protected abstract String commandLink(String sessionId, String command); + protected abstract String commandLink(String sessionId, String requestId, String command); protected static final void appendCommonConnectionParams(final StringBuilder uri) { diff --git a/src/de/schildbach/pte/AtcProvider.java b/src/de/schildbach/pte/AtcProvider.java index 7741266b..e7ba5355 100644 --- a/src/de/schildbach/pte/AtcProvider.java +++ b/src/de/schildbach/pte/AtcProvider.java @@ -116,12 +116,13 @@ public class AtcProvider extends AbstractEfaProvider } @Override - protected String commandLink(final String sessionId, final String command) + protected String commandLink(final String sessionId, final String requestId, final String command) { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE); uri.append("XSLT_TRIP_REQUEST2"); uri.append("?sessionID=").append(sessionId); + uri.append("&requestID=").append(requestId); appendCommonConnectionParams(uri); uri.append("&command=").append(command); return uri.toString(); diff --git a/src/de/schildbach/pte/AvvProvider.java b/src/de/schildbach/pte/AvvProvider.java index 917ca77c..ef3e65b0 100644 --- a/src/de/schildbach/pte/AvvProvider.java +++ b/src/de/schildbach/pte/AvvProvider.java @@ -117,12 +117,13 @@ public class AvvProvider extends AbstractEfaProvider } @Override - protected String commandLink(final String sessionId, final String command) + protected String commandLink(final String sessionId, final String requestId, final String command) { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE); uri.append("XSLT_TRIP_REQUEST2"); uri.append("?sessionID=").append(sessionId); + uri.append("&requestID=").append(requestId); appendCommonConnectionParams(uri); uri.append("&command=").append(command); return uri.toString(); diff --git a/src/de/schildbach/pte/BsagProvider.java b/src/de/schildbach/pte/BsagProvider.java index b84b94da..6716ccca 100644 --- a/src/de/schildbach/pte/BsagProvider.java +++ b/src/de/schildbach/pte/BsagProvider.java @@ -116,12 +116,13 @@ public class BsagProvider extends AbstractEfaProvider } @Override - protected String commandLink(final String sessionId, final String command) + protected String commandLink(final String sessionId, final String requestId, final String command) { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE); uri.append("XSLT_TRIP_REQUEST2"); uri.append("?sessionID=").append(sessionId); + uri.append("&requestID=").append(requestId); appendCommonConnectionParams(uri); uri.append("&command=").append(command); return uri.toString(); diff --git a/src/de/schildbach/pte/BsvagProvider.java b/src/de/schildbach/pte/BsvagProvider.java index 5d345b51..5c7e28e6 100644 --- a/src/de/schildbach/pte/BsvagProvider.java +++ b/src/de/schildbach/pte/BsvagProvider.java @@ -117,12 +117,13 @@ public class BsvagProvider extends AbstractEfaProvider } @Override - protected String commandLink(final String sessionId, final String command) + protected String commandLink(final String sessionId, final String requestId, final String command) { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE); uri.append("XSLT_TRIP_REQUEST2"); uri.append("?sessionID=").append(sessionId); + uri.append("&requestID=").append(requestId); appendCommonConnectionParams(uri); uri.append("&command=").append(command); return uri.toString(); diff --git a/src/de/schildbach/pte/BvbProvider.java b/src/de/schildbach/pte/BvbProvider.java index a983dd97..2eeee57b 100644 --- a/src/de/schildbach/pte/BvbProvider.java +++ b/src/de/schildbach/pte/BvbProvider.java @@ -117,12 +117,13 @@ public class BvbProvider extends AbstractEfaProvider } @Override - protected String commandLink(final String sessionId, final String command) + protected String commandLink(final String sessionId, final String requestId, final String command) { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE); uri.append("XSLT_TRIP_REQUEST2"); uri.append("?sessionID=").append(sessionId); + uri.append("&requestID=").append(requestId); appendCommonConnectionParams(uri); uri.append("&command=").append(command); return uri.toString(); diff --git a/src/de/schildbach/pte/DingProvider.java b/src/de/schildbach/pte/DingProvider.java index 7f7053c4..34e19083 100644 --- a/src/de/schildbach/pte/DingProvider.java +++ b/src/de/schildbach/pte/DingProvider.java @@ -117,12 +117,13 @@ public class DingProvider extends AbstractEfaProvider } @Override - protected String commandLink(final String sessionId, final String command) + protected String commandLink(final String sessionId, final String requestId, final String command) { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE); uri.append("XSLT_TRIP_REQUEST2"); uri.append("?sessionID=").append(sessionId); + uri.append("&requestID=").append(requestId); appendCommonConnectionParams(uri); uri.append("&command=").append(command); return uri.toString(); diff --git a/src/de/schildbach/pte/DubProvider.java b/src/de/schildbach/pte/DubProvider.java index 6b218631..65db8338 100644 --- a/src/de/schildbach/pte/DubProvider.java +++ b/src/de/schildbach/pte/DubProvider.java @@ -124,12 +124,13 @@ public class DubProvider extends AbstractEfaProvider } @Override - protected String commandLink(final String sessionId, final String command) + protected String commandLink(final String sessionId, final String requestId, final String command) { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE); uri.append("XSLT_TRIP_REQUEST2"); uri.append("?sessionID=").append(sessionId); + uri.append("&requestID=").append(requestId); appendCommonConnectionParams(uri); uri.append("&command=").append(command); return uri.toString(); diff --git a/src/de/schildbach/pte/GvhProvider.java b/src/de/schildbach/pte/GvhProvider.java index b737bccf..a3f4ac11 100644 --- a/src/de/schildbach/pte/GvhProvider.java +++ b/src/de/schildbach/pte/GvhProvider.java @@ -115,12 +115,13 @@ public class GvhProvider extends AbstractEfaProvider } @Override - protected String commandLink(final String sessionId, final String command) + protected String commandLink(final String sessionId, final String requestId, final String command) { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE); uri.append("XSLT_TRIP_REQUEST2"); uri.append("?sessionID=").append(sessionId); + uri.append("&requestID=").append(requestId); appendCommonConnectionParams(uri); uri.append("&command=").append(command); return uri.toString(); diff --git a/src/de/schildbach/pte/IvbProvider.java b/src/de/schildbach/pte/IvbProvider.java index 4748a820..97ea90b6 100644 --- a/src/de/schildbach/pte/IvbProvider.java +++ b/src/de/schildbach/pte/IvbProvider.java @@ -117,12 +117,13 @@ public class IvbProvider extends AbstractEfaProvider } @Override - protected String commandLink(final String sessionId, final String command) + protected String commandLink(final String sessionId, final String requestId, final String command) { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE); uri.append("XSLT_TRIP_REQUEST2"); uri.append("?sessionID=").append(sessionId); + uri.append("&requestID=").append(requestId); appendCommonConnectionParams(uri); uri.append("&command=").append(command); return uri.toString(); diff --git a/src/de/schildbach/pte/KvvProvider.java b/src/de/schildbach/pte/KvvProvider.java index fd683df4..bca34b4e 100644 --- a/src/de/schildbach/pte/KvvProvider.java +++ b/src/de/schildbach/pte/KvvProvider.java @@ -116,12 +116,13 @@ public class KvvProvider extends AbstractEfaProvider } @Override - protected String commandLink(final String sessionId, final String command) + protected String commandLink(final String sessionId, final String requestId, final String command) { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE); uri.append("XSLT_TRIP_REQUEST2"); uri.append("?sessionID=").append(sessionId); + uri.append("&requestID=").append(requestId); appendCommonConnectionParams(uri); uri.append("&command=").append(command); return uri.toString(); diff --git a/src/de/schildbach/pte/LinzProvider.java b/src/de/schildbach/pte/LinzProvider.java index a04bd07e..7b80648d 100644 --- a/src/de/schildbach/pte/LinzProvider.java +++ b/src/de/schildbach/pte/LinzProvider.java @@ -121,12 +121,13 @@ public class LinzProvider extends AbstractEfaProvider } @Override - protected String commandLink(final String sessionId, final String command) + protected String commandLink(final String sessionId, final String requestId, final String command) { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE); uri.append("XSLT_TRIP_REQUEST2"); uri.append("?sessionID=").append(sessionId); + uri.append("&requestID=").append(requestId); appendCommonConnectionParams(uri); uri.append("&command=").append(command); return uri.toString(); diff --git a/src/de/schildbach/pte/MariborProvider.java b/src/de/schildbach/pte/MariborProvider.java index 30fed1da..79cbab4b 100644 --- a/src/de/schildbach/pte/MariborProvider.java +++ b/src/de/schildbach/pte/MariborProvider.java @@ -116,12 +116,13 @@ public class MariborProvider extends AbstractEfaProvider } @Override - protected String commandLink(final String sessionId, final String command) + protected String commandLink(final String sessionId, final String requestId, final String command) { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE); uri.append("XSLT_TRIP_REQUEST2"); uri.append("?sessionID=").append(sessionId); + uri.append("&requestID=").append(requestId); appendCommonConnectionParams(uri); uri.append("&command=").append(command); return uri.toString(); diff --git a/src/de/schildbach/pte/MetProvider.java b/src/de/schildbach/pte/MetProvider.java index 094ce258..8c4399fc 100644 --- a/src/de/schildbach/pte/MetProvider.java +++ b/src/de/schildbach/pte/MetProvider.java @@ -123,12 +123,13 @@ public class MetProvider extends AbstractEfaProvider } @Override - protected String commandLink(final String sessionId, final String command) + protected String commandLink(final String sessionId, final String requestId, final String command) { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE); uri.append("XSLT_TRIP_REQUEST2"); uri.append("?sessionID=").append(sessionId); + uri.append("&requestID=").append(requestId); appendCommonConnectionParams(uri); uri.append("&command=").append(command); return uri.toString(); diff --git a/src/de/schildbach/pte/MvvProvider.java b/src/de/schildbach/pte/MvvProvider.java index 7a0fa020..30129829 100644 --- a/src/de/schildbach/pte/MvvProvider.java +++ b/src/de/schildbach/pte/MvvProvider.java @@ -120,12 +120,13 @@ public class MvvProvider extends AbstractEfaProvider } @Override - protected String commandLink(final String sessionId, final String command) + protected String commandLink(final String sessionId, final String requestId, final String command) { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE); uri.append("XSLT_TRIP_REQUEST2"); uri.append("?sessionID=").append(sessionId); + uri.append("&requestID=").append(requestId); appendCommonConnectionParams(uri); uri.append("&command=").append(command); return uri.toString(); diff --git a/src/de/schildbach/pte/NaldoProvider.java b/src/de/schildbach/pte/NaldoProvider.java index 6bf170a3..cde3a0aa 100644 --- a/src/de/schildbach/pte/NaldoProvider.java +++ b/src/de/schildbach/pte/NaldoProvider.java @@ -116,12 +116,13 @@ public class NaldoProvider extends AbstractEfaProvider } @Override - protected String commandLink(final String sessionId, final String command) + protected String commandLink(final String sessionId, final String requestId, final String command) { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE); uri.append("XSLT_TRIP_REQUEST2"); uri.append("?sessionID=").append(sessionId); + uri.append("&requestID=").append(requestId); appendCommonConnectionParams(uri); uri.append("&command=").append(command); return uri.toString(); diff --git a/src/de/schildbach/pte/SfProvider.java b/src/de/schildbach/pte/SfProvider.java index f97d06b3..2ef917ac 100644 --- a/src/de/schildbach/pte/SfProvider.java +++ b/src/de/schildbach/pte/SfProvider.java @@ -138,12 +138,13 @@ public class SfProvider extends AbstractEfaProvider } @Override - protected String commandLink(final String sessionId, final String command) + protected String commandLink(final String sessionId, final String requestId, final String command) { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE); uri.append("XSLT_TRIP_REQUEST2"); uri.append("?sessionID=").append(sessionId); + uri.append("&requestID=").append(requestId); appendCommonConnectionParams(uri); uri.append("&command=").append(command); return uri.toString(); diff --git a/src/de/schildbach/pte/StvProvider.java b/src/de/schildbach/pte/StvProvider.java index 042175e1..3660dfcf 100644 --- a/src/de/schildbach/pte/StvProvider.java +++ b/src/de/schildbach/pte/StvProvider.java @@ -116,12 +116,13 @@ public class StvProvider extends AbstractEfaProvider } @Override - protected String commandLink(final String sessionId, final String command) + protected String commandLink(final String sessionId, final String requestId, final String command) { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE); uri.append("XSLT_TRIP_REQUEST2"); uri.append("?sessionID=").append(sessionId); + uri.append("&requestID=").append(requestId); appendCommonConnectionParams(uri); uri.append("&command=").append(command); return uri.toString(); diff --git a/src/de/schildbach/pte/SvvProvider.java b/src/de/schildbach/pte/SvvProvider.java index 803294cd..d8d4a896 100644 --- a/src/de/schildbach/pte/SvvProvider.java +++ b/src/de/schildbach/pte/SvvProvider.java @@ -115,12 +115,13 @@ public class SvvProvider extends AbstractEfaProvider } @Override - protected String commandLink(final String sessionId, final String command) + protected String commandLink(final String sessionId, final String requestId, final String command) { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE); uri.append("XSLT_TRIP_REQUEST2"); uri.append("?sessionID=").append(sessionId); + uri.append("&requestID=").append(requestId); appendCommonConnectionParams(uri); uri.append("&command=").append(command); return uri.toString(); diff --git a/src/de/schildbach/pte/SydneyProvider.java b/src/de/schildbach/pte/SydneyProvider.java index 77d5f044..b80a5dc3 100644 --- a/src/de/schildbach/pte/SydneyProvider.java +++ b/src/de/schildbach/pte/SydneyProvider.java @@ -123,12 +123,13 @@ public class SydneyProvider extends AbstractEfaProvider } @Override - protected String commandLink(final String sessionId, final String command) + protected String commandLink(final String sessionId, final String requestId, final String command) { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE); uri.append("XSLT_TRIP_REQUEST2"); uri.append("?sessionID=").append(sessionId); + uri.append("&requestID=").append(requestId); appendCommonConnectionParams(uri); uri.append("&command=").append(command); return uri.toString(); diff --git a/src/de/schildbach/pte/TflProvider.java b/src/de/schildbach/pte/TflProvider.java index 6c4641e4..a25fdca6 100644 --- a/src/de/schildbach/pte/TflProvider.java +++ b/src/de/schildbach/pte/TflProvider.java @@ -126,12 +126,13 @@ public class TflProvider extends AbstractEfaProvider } @Override - protected String commandLink(final String sessionId, final String command) + protected String commandLink(final String sessionId, final String requestId, final String command) { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE); uri.append("XSLT_TRIP_REQUEST2"); uri.append("?sessionID=").append(sessionId); + uri.append("&requestID=").append(requestId); appendCommonConnectionParams(uri); uri.append("&command=").append(command); return uri.toString(); diff --git a/src/de/schildbach/pte/TleaProvider.java b/src/de/schildbach/pte/TleaProvider.java index 7da89d47..231b51ad 100644 --- a/src/de/schildbach/pte/TleaProvider.java +++ b/src/de/schildbach/pte/TleaProvider.java @@ -124,12 +124,13 @@ public class TleaProvider extends AbstractEfaProvider } @Override - protected String commandLink(final String sessionId, final String command) + protected String commandLink(final String sessionId, final String requestId, final String command) { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE); uri.append("XSLT_TRIP_REQUEST2"); uri.append("?sessionID=").append(sessionId); + uri.append("&requestID=").append(requestId); appendCommonConnectionParams(uri); uri.append("&command=").append(command); return uri.toString(); diff --git a/src/de/schildbach/pte/TlemProvider.java b/src/de/schildbach/pte/TlemProvider.java index 5c56d914..6a066e9a 100644 --- a/src/de/schildbach/pte/TlemProvider.java +++ b/src/de/schildbach/pte/TlemProvider.java @@ -124,12 +124,13 @@ public class TlemProvider extends AbstractEfaProvider } @Override - protected String commandLink(final String sessionId, final String command) + protected String commandLink(final String sessionId, final String requestId, final String command) { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE); uri.append("XSLT_TRIP_REQUEST2"); uri.append("?sessionID=").append(sessionId); + uri.append("&requestID=").append(requestId); appendCommonConnectionParams(uri); uri.append("&command=").append(command); return uri.toString(); diff --git a/src/de/schildbach/pte/TlseProvider.java b/src/de/schildbach/pte/TlseProvider.java index 9b5406d7..c3e61ce2 100644 --- a/src/de/schildbach/pte/TlseProvider.java +++ b/src/de/schildbach/pte/TlseProvider.java @@ -124,12 +124,13 @@ public class TlseProvider extends AbstractEfaProvider } @Override - protected String commandLink(final String sessionId, final String command) + protected String commandLink(final String sessionId, final String requestId, final String command) { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE); uri.append("XSLT_TRIP_REQUEST2"); uri.append("?sessionID=").append(sessionId); + uri.append("&requestID=").append(requestId); appendCommonConnectionParams(uri); uri.append("&command=").append(command); return uri.toString(); diff --git a/src/de/schildbach/pte/TlswProvider.java b/src/de/schildbach/pte/TlswProvider.java index aba1181d..13f02af5 100644 --- a/src/de/schildbach/pte/TlswProvider.java +++ b/src/de/schildbach/pte/TlswProvider.java @@ -123,12 +123,13 @@ public class TlswProvider extends AbstractEfaProvider } @Override - protected String commandLink(final String sessionId, final String command) + protected String commandLink(final String sessionId, final String requestId, final String command) { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE); uri.append("XSLT_TRIP_REQUEST2"); uri.append("?sessionID=").append(sessionId); + uri.append("&requestID=").append(requestId); appendCommonConnectionParams(uri); uri.append("&command=").append(command); return uri.toString(); diff --git a/src/de/schildbach/pte/VagfrProvider.java b/src/de/schildbach/pte/VagfrProvider.java index 606be385..7ff85c94 100644 --- a/src/de/schildbach/pte/VagfrProvider.java +++ b/src/de/schildbach/pte/VagfrProvider.java @@ -116,7 +116,7 @@ public class VagfrProvider extends AbstractEfaProvider } @Override - protected String commandLink(final String sessionId, final String command) + protected String commandLink(final String sessionId, final String requestId, final String command) { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE); diff --git a/src/de/schildbach/pte/VblProvider.java b/src/de/schildbach/pte/VblProvider.java index 88759855..a6b1296f 100644 --- a/src/de/schildbach/pte/VblProvider.java +++ b/src/de/schildbach/pte/VblProvider.java @@ -116,12 +116,13 @@ public class VblProvider extends AbstractEfaProvider } @Override - protected String commandLink(final String sessionId, final String command) + protected String commandLink(final String sessionId, final String requestId, final String command) { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE); uri.append("XSLT_TRIP_REQUEST2"); uri.append("?sessionID=").append(sessionId); + uri.append("&requestID=").append(requestId); appendCommonConnectionParams(uri); uri.append("&command=").append(command); return uri.toString(); diff --git a/src/de/schildbach/pte/VmsProvider.java b/src/de/schildbach/pte/VmsProvider.java index 42a9976b..245cb784 100644 --- a/src/de/schildbach/pte/VmsProvider.java +++ b/src/de/schildbach/pte/VmsProvider.java @@ -116,12 +116,13 @@ public class VmsProvider extends AbstractEfaProvider } @Override - protected String commandLink(final String sessionId, final String command) + protected String commandLink(final String sessionId, final String requestId, final String command) { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE); uri.append("XSLT_TRIP_REQUEST2"); uri.append("?sessionID=").append(sessionId); + uri.append("&requestID=").append(requestId); appendCommonConnectionParams(uri); uri.append("&command=").append(command); return uri.toString(); diff --git a/src/de/schildbach/pte/VmvProvider.java b/src/de/schildbach/pte/VmvProvider.java index 1dc3d589..39d01b9e 100644 --- a/src/de/schildbach/pte/VmvProvider.java +++ b/src/de/schildbach/pte/VmvProvider.java @@ -131,12 +131,13 @@ public class VmvProvider extends AbstractEfaProvider } @Override - protected String commandLink(final String sessionId, final String command) + protected String commandLink(final String sessionId, final String requestId, final String command) { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE); uri.append("XSLT_TRIP_REQUEST2"); uri.append("?sessionID=").append(sessionId); + uri.append("&requestID=").append(requestId); appendCommonConnectionParams(uri); uri.append("&command=").append(command); return uri.toString(); diff --git a/src/de/schildbach/pte/VorProvider.java b/src/de/schildbach/pte/VorProvider.java index 3116a76e..25788210 100644 --- a/src/de/schildbach/pte/VorProvider.java +++ b/src/de/schildbach/pte/VorProvider.java @@ -116,12 +116,13 @@ public class VorProvider extends AbstractEfaProvider } @Override - protected String commandLink(final String sessionId, final String command) + protected String commandLink(final String sessionId, final String requestId, final String command) { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE); uri.append("XSLT_TRIP_REQUEST2"); uri.append("?sessionID=").append(sessionId); + uri.append("&requestID=").append(requestId); appendCommonConnectionParams(uri); uri.append("&command=").append(command); return uri.toString(); diff --git a/src/de/schildbach/pte/VrnProvider.java b/src/de/schildbach/pte/VrnProvider.java index 3d48938c..6317317d 100644 --- a/src/de/schildbach/pte/VrnProvider.java +++ b/src/de/schildbach/pte/VrnProvider.java @@ -116,12 +116,13 @@ public class VrnProvider extends AbstractEfaProvider } @Override - protected String commandLink(final String sessionId, final String command) + protected String commandLink(final String sessionId, final String requestId, final String command) { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE); uri.append("XSLT_TRIP_REQUEST2"); uri.append("?sessionID=").append(sessionId); + uri.append("&requestID=").append(requestId); appendCommonConnectionParams(uri); uri.append("&command=").append(command); return uri.toString(); diff --git a/src/de/schildbach/pte/VrrProvider.java b/src/de/schildbach/pte/VrrProvider.java index 105cca6c..45965cd4 100644 --- a/src/de/schildbach/pte/VrrProvider.java +++ b/src/de/schildbach/pte/VrrProvider.java @@ -122,12 +122,13 @@ public class VrrProvider extends AbstractEfaProvider } @Override - protected String commandLink(final String sessionId, final String command) + protected String commandLink(final String sessionId, final String requestId, final String command) { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE); uri.append("XSLT_TRIP_REQUEST2"); uri.append("?sessionID=").append(sessionId); + uri.append("&requestID=").append(requestId); appendCommonConnectionParams(uri); uri.append("&command=").append(command); return uri.toString(); diff --git a/src/de/schildbach/pte/VrtProvider.java b/src/de/schildbach/pte/VrtProvider.java index 5311a8cc..1b4d5677 100644 --- a/src/de/schildbach/pte/VrtProvider.java +++ b/src/de/schildbach/pte/VrtProvider.java @@ -116,12 +116,13 @@ public class VrtProvider extends AbstractEfaProvider } @Override - protected String commandLink(final String sessionId, final String command) + protected String commandLink(final String sessionId, final String requestId, final String command) { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE); uri.append("XSLT_TRIP_REQUEST2"); uri.append("?sessionID=").append(sessionId); + uri.append("&requestID=").append(requestId); appendCommonConnectionParams(uri); uri.append("&command=").append(command); return uri.toString(); diff --git a/src/de/schildbach/pte/VvmProvider.java b/src/de/schildbach/pte/VvmProvider.java index e04796a4..d0aa3e4c 100644 --- a/src/de/schildbach/pte/VvmProvider.java +++ b/src/de/schildbach/pte/VvmProvider.java @@ -116,12 +116,13 @@ public class VvmProvider extends AbstractEfaProvider } @Override - protected String commandLink(final String sessionId, final String command) + protected String commandLink(final String sessionId, final String requestId, final String command) { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE); uri.append("XSLT_TRIP_REQUEST2"); uri.append("?sessionID=").append(sessionId); + uri.append("&requestID=").append(requestId); appendCommonConnectionParams(uri); uri.append("&command=").append(command); return uri.toString(); diff --git a/src/de/schildbach/pte/VvoProvider.java b/src/de/schildbach/pte/VvoProvider.java index e59f9bd1..3ef43e4b 100644 --- a/src/de/schildbach/pte/VvoProvider.java +++ b/src/de/schildbach/pte/VvoProvider.java @@ -115,12 +115,13 @@ public class VvoProvider extends AbstractEfaProvider } @Override - protected String commandLink(final String sessionId, final String command) + protected String commandLink(final String sessionId, final String requestId, final String command) { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE); uri.append("XSLT_TRIP_REQUEST2"); uri.append("?sessionID=").append(sessionId); + uri.append("&requestID=").append(requestId); appendCommonConnectionParams(uri); uri.append("&command=").append(command); return uri.toString(); diff --git a/src/de/schildbach/pte/VvsProvider.java b/src/de/schildbach/pte/VvsProvider.java index cf90df0f..53f1dc64 100644 --- a/src/de/schildbach/pte/VvsProvider.java +++ b/src/de/schildbach/pte/VvsProvider.java @@ -132,12 +132,13 @@ public class VvsProvider extends AbstractEfaProvider } @Override - protected String commandLink(final String sessionId, final String command) + protected String commandLink(final String sessionId, final String requestId, final String command) { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE); uri.append("XSLT_TRIP_REQUEST2"); uri.append("?sessionID=").append(sessionId); + uri.append("&requestID=").append(requestId); appendCommonConnectionParams(uri); uri.append("&command=").append(command); return uri.toString();