diff --git a/enabler/src/de/schildbach/pte/VbnProvider.java b/enabler/src/de/schildbach/pte/VbnProvider.java index 87fcd1f6..8b09c622 100644 --- a/enabler/src/de/schildbach/pte/VbnProvider.java +++ b/enabler/src/de/schildbach/pte/VbnProvider.java @@ -49,11 +49,12 @@ public class VbnProvider extends AbstractHafasClientInterfaceProvider { Product.REGIONAL_TRAIN, Product.REGIONAL_TRAIN, Product.SUBURBAN_TRAIN, Product.BUS, Product.FERRY, Product.SUBWAY, Product.TRAM, Product.ON_DEMAND }; - public VbnProvider(final String apiAuthorization) { + public VbnProvider(final String apiAuthorization, final byte[] salt) { super(NetworkId.VBN, API_BASE, PRODUCTS_MAP); - setApiVersion("1.13"); + setApiVersion("1.24"); setApiClient("{\"id\":\"VBN\",\"type\":\"AND\"}"); setApiAuthorization(apiAuthorization); + setRequestMicMacSalt(salt); setStyles(STYLES); } diff --git a/enabler/test/de/schildbach/pte/live/VbnProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VbnProviderLiveTest.java index 92368f22..ad37e589 100644 --- a/enabler/test/de/schildbach/pte/live/VbnProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VbnProviderLiveTest.java @@ -26,6 +26,7 @@ import java.util.Date; import org.junit.Test; +import de.schildbach.pte.AbstractHafasClientInterfaceProvider; import de.schildbach.pte.VbnProvider; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; @@ -39,7 +40,8 @@ import de.schildbach.pte.dto.SuggestLocationsResult; */ public class VbnProviderLiveTest extends AbstractProviderLiveTest { public VbnProviderLiveTest() { - super(new VbnProvider(secretProperty("vbn.api_authorization"))); + super(new VbnProvider(secretProperty("vbn.api_authorization"), AbstractHafasClientInterfaceProvider + .decryptSalt(secretProperty("vbn.encrypted_salt"), secretProperty("hci.salt_encryption_key")))); } @Test diff --git a/enabler/test/de/schildbach/pte/live/secrets.properties.template b/enabler/test/de/schildbach/pte/live/secrets.properties.template index 19bf67a8..8a0cdc7a 100644 --- a/enabler/test/de/schildbach/pte/live/secrets.properties.template +++ b/enabler/test/de/schildbach/pte/live/secrets.properties.template @@ -9,6 +9,7 @@ vbb.encrypted_salt = nvv.api_authorization = sh.api_authorization = vbn.api_authorization = +vbn.encrypted_salt = nasa.api_authorization = vgs.api_authorization = vgs.encrypted_salt =