Only register engine once per request

lostzen · Jun 20, 2016 · fa4873a · fa4873a
1 parent 7299c63
commit fa4873a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/lost/src/main/java/com/mapzen/android/lost/internal/FusedLocationProviderApiImpl.java b/lost/src/main/java/com/mapzen/android/lost/internal/FusedLocationProviderApiImpl.java
@@ -43,9 +43,12 @@ public Location getLastLocation() {
 
     @Override
     public void requestLocationUpdates(LocationRequest request, LocationListener listener) {
+        LocationEngine existing = locationEngines.get(request);
         LocationEngine engine = locationEngineForRequest(request);
         addListenerForEngine(engine, listener);
-        engine.setRequest(request);
+        if (existing == null) {
+            engine.setRequest(request);
+        }
     }
 
     @Override
@@ -227,7 +230,7 @@ private void shutdownAllEngines() {
     }
 
     @VisibleForTesting
-    public List<LocationListener> getListeners() {
+    List<LocationListener> getListeners() {
         List<LocationListener> listeners = new ArrayList<>();
         for (LocationEngine engine : engineListeners.keySet()) {
             listeners.addAll(engineListeners.get(engine));

diff --git a/lost/src/test/java/com/mapzen/android/lost/internal/FusedLocationProviderApiImplTest.java b/lost/src/test/java/com/mapzen/android/lost/internal/FusedLocationProviderApiImplTest.java
@@ -219,7 +219,7 @@ public void setMockMode_shouldNotRegisterDuplicateListeners() throws Exception {
         api.requestLocationUpdates(request, listener);
         api.setMockMode(false);
         api.requestLocationUpdates(request, listener);
-        assertThat(shadowLocationManager.getRequestLocationUpdateListeners()).hasSize(4);
+        assertThat(shadowLocationManager.getRequestLocationUpdateListeners()).hasSize(2);
     }
 
     @Test