fix(android): add null checks for map in MapView

Resolves #4074
react-native-maps · Mar 14, 2022 · 585d89e · 585d89e
1 parent 3338a96
commit 585d89e
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapView.java b/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapView.java
@@ -395,7 +395,7 @@ public void onCameraIdle() {
     lifecycleListener = new LifecycleEventListener() {
       @Override
       public void onHostResume() {
-        if (hasPermissions()) {
+        if (hasPermissions() && map != null) {
           //noinspection MissingPermission
           map.setMyLocationEnabled(showUserLocation);
           map.setLocationSource(fusedLocationSource);
@@ -410,7 +410,7 @@ public void onHostResume() {
 
       @Override
       public void onHostPause() {
-        if (hasPermissions()) {
+        if (hasPermissions() && map != null) {
           //noinspection MissingPermission
           map.setMyLocationEnabled(false);
         }
@@ -1011,7 +1011,9 @@ public boolean dispatchTouchEvent(MotionEvent ev) {
 
     int X = (int)ev.getX();          
     int Y = (int)ev.getY();
-    tapLocation = map.getProjection().fromScreenLocation(new Point(X,Y));
+    if(map != null) {
+      tapLocation = map.getProjection().fromScreenLocation(new Point(X,Y));
+    }
 
     int action = MotionEventCompat.getActionMasked(ev);