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

Try/catch invocation of cancelcallback #10659

Closed
wants to merge 1 commit into from
Closed

Try/catch invocation of cancelcallback #10659

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 10 additions & 5 deletions platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,11 +172,16 @@ void cancelTransitions() {
// notify user about cancel
cameraChangeDispatcher.onCameraMoveCanceled();

// notify animateCamera and easeCamera about cancelling
if (cameraCancelableCallback != null) {
cameraChangeDispatcher.onCameraIdle();
cameraCancelableCallback.onCancel();
cameraCancelableCallback = null;
try {
// notify animateCamera and easeCamera about cancelling
if (cameraCancelableCallback != null) {
cameraChangeDispatcher.onCameraIdle();
cameraCancelableCallback.onCancel();
cameraCancelableCallback = null;
}
} catch (NullPointerException exception) {
// see #10643
Timber.e("Couldn't invoke cameraCancelCallback#onCancel");
}

// cancel ongoing transitions
Expand Down