Fix OffRoute engine cleared before service shutdown

mapbox · Aug 3, 2018 · 3c41a7a · 3c41a7a
1 parent 93cf745
commit 3c41a7a
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 45 deletions.
diff --git a/...on-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewModel.java b/...on-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewModel.java
@@ -97,6 +97,7 @@ public void onDestroy(boolean isChangingConfigurations) {
       deactivateInstructionPlayer();
       endNavigation();
     }
+    navigation.setCameraEngine(null);
     navigationViewEventDispatcher = null;
   }
 

diff --git a/.../src/main/java/com/mapbox/services/android/navigation/v5/navigation/MapboxNavigation.java b/.../src/main/java/com/mapbox/services/android/navigation/v5/navigation/MapboxNavigation.java
@@ -212,7 +212,6 @@ public void onDestroy() {
     removeProgressChangeListener(null);
     removeMilestoneEventListener(null);
     removeNavigationEventListener(null);
-    navigationEngineFactory.clearEngines();
   }
 
   // Public APIs

diff --git a/...in/java/com/mapbox/services/android/navigation/v5/navigation/NavigationEngineFactory.java b/...in/java/com/mapbox/services/android/navigation/v5/navigation/NavigationEngineFactory.java
@@ -64,13 +64,6 @@ void updateCameraEngine(Camera cameraEngine) {
     this.cameraEngine = cameraEngine;
   }
 
-  void clearEngines() {
-    offRouteEngine = null;
-    fasterRouteEngine = null;
-    snapEngine = null;
-    cameraEngine = null;
-  }
-
   private void initializeDefaultEngines() {
     cameraEngine = new SimpleCamera();
     snapEngine = new SnapToRoute();

diff --git a/...ava/com/mapbox/services/android/navigation/v5/navigation/NavigationEngineFactoryTest.java b/...ava/com/mapbox/services/android/navigation/v5/navigation/NavigationEngineFactoryTest.java
@@ -3,7 +3,6 @@
 import org.junit.Test;
 
 import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertNull;
 
 public class NavigationEngineFactoryTest {
 
@@ -35,42 +34,6 @@ public void onInitialization_defaultFasterRouteEngineIsCreated() {
     assertNotNull(provider.retrieveFasterRouteEngine());
   }
 
-  @Test
-  public void clearEngines_cameraEngineIsRemoved() {
-    NavigationEngineFactory provider = new NavigationEngineFactory();
-
-    provider.clearEngines();
-
-    assertNull(provider.retrieveCameraEngine());
-  }
-
-  @Test
-  public void clearEngines_offRouteEngineIsRemoved() {
-    NavigationEngineFactory provider = new NavigationEngineFactory();
-
-    provider.clearEngines();
-
-    assertNull(provider.retrieveOffRouteEngine());
-  }
-
-  @Test
-  public void clearEngines_snapEngineIsRemoved() {
-    NavigationEngineFactory provider = new NavigationEngineFactory();
-
-    provider.clearEngines();
-
-    assertNull(provider.retrieveSnapEngine());
-  }
-
-  @Test
-  public void clearEngines_fasterRouteEngineIsRemoved() {
-    NavigationEngineFactory provider = new NavigationEngineFactory();
-
-    provider.clearEngines();
-
-    assertNull(provider.retrieveFasterRouteEngine());
-  }
-
   @Test
   public void updateFasterRouteEngine_ignoresNull() {
     NavigationEngineFactory provider = new NavigationEngineFactory();