From c16f2ef1937e1771c1e57b6eb34a4297fe7ee4d2 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sun, 4 Oct 2020 11:27:22 +0200 Subject: [PATCH] StationsActivity: Always show stations with no metadata suitable for product filtering. --- .../src/de/schildbach/oeffi/stations/StationsActivity.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java b/oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java index 828e6b7..949557d 100644 --- a/oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java +++ b/oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java @@ -937,6 +937,7 @@ public class StationsActivity extends OeffiMainActivity implements StationsAware } private static boolean filter(final Station station, final Collection productFilter) { + // if station has products declared, use that for matching final Set products = station.location.products; if (products != null) { final Set copy = EnumSet.copyOf(products); @@ -944,6 +945,7 @@ public class StationsActivity extends OeffiMainActivity implements StationsAware return !copy.isEmpty(); } + // if station has lines, go through them and try to match each final List lines = station.getLines(); if (lines != null) { for (final LineDestination line : lines) { @@ -955,6 +957,10 @@ public class StationsActivity extends OeffiMainActivity implements StationsAware } } + // special case: if station has no metadata suitable for product filtering, match always + if (products == null && lines == null) + return true; + return false; }