Adapt to: AbstractHafasClientInterfaceProvider: Derive checksum and mic/mac salts.

This commit is contained in:
Andreas Schildbach 2019-01-05 15:24:56 +01:00
parent d355b0d1ac
commit 811eb8fe7c

View file

@ -20,6 +20,8 @@ package de.schildbach.oeffi.network;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import com.google.common.base.Charsets;
import de.schildbach.pte.AbstractNetworkProvider; import de.schildbach.pte.AbstractNetworkProvider;
import de.schildbach.pte.AvvAachenProvider; import de.schildbach.pte.AvvAachenProvider;
import de.schildbach.pte.AvvProvider; import de.schildbach.pte.AvvProvider;
@ -104,11 +106,13 @@ public final class NetworkProviderFactory {
if (networkId.equals(NetworkId.RT)) if (networkId.equals(NetworkId.RT))
return new RtProvider(); return new RtProvider();
else if (networkId.equals(NetworkId.DB)) else if (networkId.equals(NetworkId.DB))
return new DbProvider("{\"type\":\"AID\",\"aid\":\"n91dB8Z77MLdoR0K\"}"); return new DbProvider("{\"type\":\"AID\",\"aid\":\"n91dB8Z77MLdoR0K\"}",
"bdI8UVj40K5fvxwf".getBytes(Charsets.UTF_8));
else if (networkId.equals(NetworkId.BVG)) else if (networkId.equals(NetworkId.BVG))
return new BvgProvider("{\"aid\":\"1Rxs112shyHLatUX4fofnmdxK\",\"type\":\"AID\"}"); return new BvgProvider("{\"aid\":\"1Rxs112shyHLatUX4fofnmdxK\",\"type\":\"AID\"}");
else if (networkId.equals(NetworkId.VBB)) else if (networkId.equals(NetworkId.VBB))
return new VbbProvider("{\"type\":\"AID\",\"aid\":\"hafas-vbb-apps\"}"); return new VbbProvider("{\"type\":\"AID\",\"aid\":\"hafas-vbb-apps\"}",
"RCTJM2fFxFfxxQfI".getBytes(Charsets.UTF_8));
else if (networkId.equals(NetworkId.NVV)) else if (networkId.equals(NetworkId.NVV))
return new NvvProvider("{\"type\":\"AID\",\"aid\":\"Kt8eNOH7qjVeSxNA\"}"); return new NvvProvider("{\"type\":\"AID\",\"aid\":\"Kt8eNOH7qjVeSxNA\"}");
else if (networkId.equals(NetworkId.BAYERN)) else if (networkId.equals(NetworkId.BAYERN))
@ -116,7 +120,8 @@ public final class NetworkProviderFactory {
else if (networkId.equals(NetworkId.MVV)) else if (networkId.equals(NetworkId.MVV))
return new MvvProvider(); return new MvvProvider();
else if (networkId.equals(NetworkId.INVG)) else if (networkId.equals(NetworkId.INVG))
return new InvgProvider("{\"type\":\"AID\",\"aid\":\"GITvwi3BGOmTQ2a5\"}"); return new InvgProvider("{\"type\":\"AID\",\"aid\":\"GITvwi3BGOmTQ2a5\"}",
"ERxotxpwFT7uYRsI".getBytes(Charsets.UTF_8));
else if (networkId.equals(NetworkId.AVV)) else if (networkId.equals(NetworkId.AVV))
return new AvvProvider(); return new AvvProvider();
else if (networkId.equals(NetworkId.VGN)) else if (networkId.equals(NetworkId.VGN))