[android] - validate if gesture detector is able to handle gesture

This commit is contained in:
tobrun
2018-07-12 09:29:17 +02:00
committed by Tobrun
parent bf69f1a2d3
commit b79b971f56

View File

@@ -427,7 +427,7 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
@Override
public boolean onTouchEvent(MotionEvent event) {
if (!isMapInitialized() || !isZoomButtonControllerInitialized()) {
if (!isMapInitialized() || !isZoomButtonControllerInitialized() || !isGestureDetectorInitialized()) {
return super.onTouchEvent(event);
}
@@ -459,7 +459,7 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
@Override
public boolean onGenericMotionEvent(MotionEvent event) {
if (mapGestureDetector == null) {
if (!isGestureDetectorInitialized()) {
return super.onGenericMotionEvent(event);
}
return mapGestureDetector.onGenericMotionEvent(event) || super.onGenericMotionEvent(event);
@@ -676,6 +676,10 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
return mapZoomButtonController != null;
}
private boolean isGestureDetectorInitialized() {
return mapGestureDetector != null;
}
MapboxMap getMapboxMap() {
return mapboxMap;
}