From cd50753e29d6a52d61d4a61f7c9fa246ab71fd61 Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas@schildbach.de>
Date: Sun, 6 Jan 2019 16:16:38 +0100
Subject: [PATCH] Use non-deprecated variant of
 NetworkProvider.suggestLocations().

---
 .../de/schildbach/oeffi/directions/DirectionsActivity.java   | 5 ++++-
 oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java b/oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java
index cd4ae22..ce52de4 100644
--- a/oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java
+++ b/oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java
@@ -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))
diff --git a/oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java b/oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java
index be1bf70..2037e81 100644
--- a/oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java
+++ b/oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java
@@ -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)