[mapview] avoid throwing null pointer exception on slow initialisation (

mapbox#466) (mapbox#471)
emerson233 · Jul 20, 2021 · 0f0c46b · 0f0c46b
1 parent bfd4a2e
commit 0f0c46b
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java b/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
@@ -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);
   }
 
@@ -1126,6 +1138,10 @@ private boolean isGestureDetectorInitialized() {
     return mapGestureDetector != null;
   }
 
+  private boolean isKeyDetectorInitialized() {
+    return mapKeyListener != null;
+  }
+
   @Nullable
   MapboxMap getMapboxMap() {
     return mapboxMap;