Skip to content
This repository has been archived by the owner on Jun 21, 2023. It is now read-only.

Check isLocationTracking in the right place #504

Merged
merged 2 commits into from
Jul 28, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down