Check isLocationTracking in the right place (#504)

* Check isTracking in the right place * Add test case
mapbox · Jul 30, 2020 · 04cee1c · 04cee1c
1 parent 5c12fd1
commit 04cee1c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationCameraController.java b/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationCameraController.java
@@ -114,8 +114,8 @@ void setCameraMode(@CameraMode.Mode final int cameraMode, @Nullable Location las
     }
 
     final boolean wasTracking = isLocationTracking();
-    mapboxMap.setUserAnimationInProgress(wasTracking);
     this.cameraMode = cameraMode;
+    mapboxMap.setUserAnimationInProgress(isLocationTracking());
 
     if (cameraMode != CameraMode.NONE) {
       mapboxMap.cancelTransitions();

diff --git a/...LAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationCameraControllerTest.java b/...LAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationCameraControllerTest.java
@@ -123,6 +123,21 @@ public void setCameraMode_notTrackingAdjustsFocalPoint() {
     verify(mapboxMap.getUiSettings()).setFocalPoint(null);
   }
 
+  @Test
+  public void setCameraMode_setUserAnimationInProgress() {
+    MapboxMap mapboxMap = mock(MapboxMap.class);
+    when(mapboxMap.getUiSettings()).thenReturn(mock(UiSettings.class));
+
+    LocationCameraController camera = buildCamera(mapboxMap);
+    camera.initializeOptions(mock(LocationComponentOptions.class));
+
+    camera.setCameraMode(TRACKING_GPS);
+    verify(mapboxMap).setUserAnimationInProgress(true);
+
+    camera.setCameraMode(NONE);
+    verify(mapboxMap).setUserAnimationInProgress(false);
+  }
+
   @Test
   public void setCameraMode_trackingChangeListenerCameraDismissedIsCalled() {
     OnCameraTrackingChangedListener internalTrackingChangedListener = mock(OnCameraTrackingChangedListener.class);