From 9957626f8d0d885dcc871002c6ee1dff8b6423ad Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sat, 28 Jan 2017 13:22:12 +0100 Subject: [PATCH] BVG: Fix IllegalArgumentException when suggesting locations. --- enabler/src/de/schildbach/pte/AbstractHafasProvider.java | 5 ++--- enabler/src/de/schildbach/pte/BvgProvider.java | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java b/enabler/src/de/schildbach/pte/AbstractHafasProvider.java index 3d5f22c5..7be0ce38 100644 --- a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java +++ b/enabler/src/de/schildbach/pte/AbstractHafasProvider.java @@ -18,7 +18,6 @@ package de.schildbach.pte; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; import java.util.EnumSet; @@ -110,8 +109,8 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider { for (int i = productsMap.length - 1; i >= 0; i--) { final int v = 1 << i; if (value >= v) { - final Product product = checkNotNull(productsMap[i], "unknown product " + i); - products.add(product); + if (productsMap[i] != null) + products.add(productsMap[i]); value -= v; } } diff --git a/enabler/src/de/schildbach/pte/BvgProvider.java b/enabler/src/de/schildbach/pte/BvgProvider.java index 782b942a..b71e1be4 100644 --- a/enabler/src/de/schildbach/pte/BvgProvider.java +++ b/enabler/src/de/schildbach/pte/BvgProvider.java @@ -41,7 +41,7 @@ import okhttp3.HttpUrl; public final class BvgProvider extends AbstractHafasMobileProvider { private static final HttpUrl API_BASE = HttpUrl.parse("http://bvg-apps.hafas.de/bin/"); private static final Product[] PRODUCTS_MAP = { Product.SUBURBAN_TRAIN, Product.SUBWAY, Product.TRAM, Product.BUS, - Product.FERRY, Product.HIGH_SPEED_TRAIN, Product.REGIONAL_TRAIN, Product.ON_DEMAND }; + Product.FERRY, Product.HIGH_SPEED_TRAIN, Product.REGIONAL_TRAIN, Product.ON_DEMAND, null, null }; public BvgProvider(final String jsonApiAuthorization) { super(NetworkId.BVG, API_BASE, PRODUCTS_MAP);