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

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

View file

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

View file

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