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

Avoid throwing null pointer exception on slow initialisation #471

Merged
merged 1 commit into from
Jul 14, 2020
Merged
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 @@ -530,21 +530,33 @@ public boolean onTouchEvent(MotionEvent event) {

@Override
public boolean onKeyDown(int keyCode, @NonNull KeyEvent event) {
if (!isKeyDetectorInitialized()) {
return super.onKeyDown(keyCode, event);
}
return mapKeyListener.onKeyDown(keyCode, event) || super.onKeyDown(keyCode, event);
}

@Override
public boolean onKeyLongPress(int keyCode, KeyEvent event) {
if (!isKeyDetectorInitialized()) {
return super.onKeyLongPress(keyCode, event);
}
return mapKeyListener.onKeyLongPress(keyCode, event) || super.onKeyLongPress(keyCode, event);
}

@Override
public boolean onKeyUp(int keyCode, @NonNull KeyEvent event) {
if (!isKeyDetectorInitialized()) {
return super.onKeyUp(keyCode, event);
}
return mapKeyListener.onKeyUp(keyCode, event) || super.onKeyUp(keyCode, event);
}

@Override
public boolean onTrackballEvent(@NonNull MotionEvent event) {
if (!isKeyDetectorInitialized()) {
return super.onTrackballEvent(event);
}
return mapKeyListener.onTrackballEvent(event) || super.onTrackballEvent(event);
}

Expand Down Expand Up @@ -1126,6 +1138,10 @@ private boolean isGestureDetectorInitialized() {
return mapGestureDetector != null;
}

private boolean isKeyDetectorInitialized() {
return mapKeyListener != null;
}

@Nullable
MapboxMap getMapboxMap() {
return mapboxMap;
Expand Down