mirrors/oeffi
1
0
Fork 0
mirror of https://gitlab.com/oeffi/oeffi.git synced 2025-07-08 15:18:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use non-deprecated variant of NetworkProvider.suggestLocations().

Browse source
This commit is contained in:
Andreas Schildbach 2019-01-06 16:16:38 +01:00
parent 51aabc7e75
commit cd50753e29
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java
View file

@ -25,6 +25,7 @@ import java.io.StreamCorruptedException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.Collection; import java.util.Collection;
import java.util.EnumSet;
import java.util.GregorianCalendar; import java.util.GregorianCalendar;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedList; import java.util.LinkedList;
@ -1340,8 +1341,10 @@ public class DirectionsActivity extends OeffiMainActivity implements ActivityCom
// remote autocomplete // remote autocomplete
if (constraint.length() >= 3) { if (constraint.length() >= 3) {
final NetworkProvider networkProvider = NetworkProviderFactory.provider(network); final NetworkProvider networkProvider = NetworkProviderFactory.provider(network);
final EnumSet<LocationType> suggestedLocationTypes = EnumSet
.of(LocationType.STATION, LocationType.POI, LocationType.ADDRESS);
final SuggestLocationsResult suggestLocationsResult = networkProvider final SuggestLocationsResult suggestLocationsResult = networkProvider
.suggestLocations(constraint); .suggestLocations(constraint, suggestedLocationTypes, 0);
if (suggestLocationsResult.status == SuggestLocationsResult.Status.OK) if (suggestLocationsResult.status == SuggestLocationsResult.Status.OK)
for (final Location location : suggestLocationsResult.getLocations()) for (final Location location : suggestLocationsResult.getLocations())
if (!results.contains(location)) if (!results.contains(location))

3
oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java
View file

@ -1653,7 +1653,8 @@ public class StationsActivity extends OeffiMainActivity implements StationsAware
cursor.close(); cursor.close();
} else { } else {
try { try {
final SuggestLocationsResult result = networkProvider.suggestLocations(query); final SuggestLocationsResult result = networkProvider.suggestLocations(query,
EnumSet.of(LocationType.STATION), 0);
if (result.status == SuggestLocationsResult.Status.OK) if (result.status == SuggestLocationsResult.Status.OK)
for (final Location l : result.getLocations()) for (final Location l : result.getLocations())
if (l.type == LocationType.STATION) if (l.type == LocationType.STATION)