Skip to content

fix: avoid npe by checking map controller state in nav view module #651

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jokerttu merged 2 commits into from
Sep 14, 2026
Merged

fix: avoid npe by checking map controller state in nav view module #651

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b821229
fix: avoid npe by checking map controller state in nav view module
illuminati1911 Sep 14, 2026
2f8cd2a
Merge branch 'main' into fix/naviewmodule-npe-fix
jokerttu Sep 14, 2026
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
38 changes: 19 additions & 19 deletions android/src/main/java/com/google/android/react/navsdk/NavViewModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ public void addMarker(String nativeID, ReadableMap options, final Promise promis
UiThreadUtil.runOnUiThread(
() -> {
IMapViewFragment fragment = mNavViewManager.getFragmentByNativeId(nativeID);
if (fragment == null) {
if (fragment == null || fragment.getMapController() == null) {
promise.reject(JsErrors.NO_MAP_ERROR_CODE, JsErrors.NO_MAP_ERROR_MESSAGE);
return;
}
Expand All @@ -175,7 +175,7 @@ public void addPolyline(String nativeID, ReadableMap options, final Promise prom
UiThreadUtil.runOnUiThread(
() -> {
IMapViewFragment fragment = mNavViewManager.getFragmentByNativeId(nativeID);
if (fragment == null) {
if (fragment == null || fragment.getMapController() == null) {
promise.reject(JsErrors.NO_MAP_ERROR_CODE, JsErrors.NO_MAP_ERROR_MESSAGE);
return;
}
Expand All @@ -192,7 +192,7 @@ public void addPolygon(String nativeID, ReadableMap options, final Promise promi
UiThreadUtil.runOnUiThread(
() -> {
IMapViewFragment fragment = mNavViewManager.getFragmentByNativeId(nativeID);
if (fragment == null) {
if (fragment == null || fragment.getMapController() == null) {
promise.reject(JsErrors.NO_MAP_ERROR_CODE, JsErrors.NO_MAP_ERROR_MESSAGE);
return;
}
Expand All @@ -209,7 +209,7 @@ public void addCircle(String nativeID, ReadableMap options, final Promise promis
UiThreadUtil.runOnUiThread(
() -> {
IMapViewFragment fragment = mNavViewManager.getFragmentByNativeId(nativeID);
if (fragment == null) {
if (fragment == null || fragment.getMapController() == null) {
promise.reject(JsErrors.NO_MAP_ERROR_CODE, JsErrors.NO_MAP_ERROR_MESSAGE);
return;
}
Expand All @@ -226,7 +226,7 @@ public void addGroundOverlay(String nativeID, ReadableMap options, final Promise
UiThreadUtil.runOnUiThread(
() -> {
IMapViewFragment fragment = mNavViewManager.getFragmentByNativeId(nativeID);
if (fragment == null) {
if (fragment == null || fragment.getMapController() == null) {
promise.reject(JsErrors.NO_MAP_ERROR_CODE, JsErrors.NO_MAP_ERROR_MESSAGE);
return;
}
Expand All @@ -251,7 +251,7 @@ public void moveCamera(String nativeID, ReadableMap cameraPosition, final Promis
UiThreadUtil.runOnUiThread(
() -> {
IMapViewFragment fragment = mNavViewManager.getFragmentByNativeId(nativeID);
if (fragment == null) {
if (fragment == null || fragment.getMapController() == null) {
promise.reject(JsErrors.NO_MAP_ERROR_CODE, JsErrors.NO_MAP_ERROR_MESSAGE);
return;
}
Expand Down Expand Up @@ -285,7 +285,7 @@ public void clearMapView(String nativeID, final Promise promise) {
UiThreadUtil.runOnUiThread(
() -> {
IMapViewFragment fragment = mNavViewManager.getFragmentByNativeId(nativeID);
if (fragment == null) {
if (fragment == null || fragment.getMapController() == null) {
promise.reject(JsErrors.NO_MAP_ERROR_CODE, JsErrors.NO_MAP_ERROR_MESSAGE);
return;
}
Expand All @@ -300,7 +300,7 @@ public void removeMarker(String nativeID, String id, final Promise promise) {
UiThreadUtil.runOnUiThread(
() -> {
IMapViewFragment fragment = mNavViewManager.getFragmentByNativeId(nativeID);
if (fragment == null) {
if (fragment == null || fragment.getMapController() == null) {
promise.reject(JsErrors.NO_MAP_ERROR_CODE, JsErrors.NO_MAP_ERROR_MESSAGE);
return;
}
Expand All @@ -315,7 +315,7 @@ public void removePolyline(String nativeID, String id, final Promise promise) {
UiThreadUtil.runOnUiThread(
() -> {
IMapViewFragment fragment = mNavViewManager.getFragmentByNativeId(nativeID);
if (fragment == null) {
if (fragment == null || fragment.getMapController() == null) {
promise.reject(JsErrors.NO_MAP_ERROR_CODE, JsErrors.NO_MAP_ERROR_MESSAGE);
return;
}
Expand All @@ -330,7 +330,7 @@ public void removePolygon(String nativeID, String id, final Promise promise) {
UiThreadUtil.runOnUiThread(
() -> {
IMapViewFragment fragment = mNavViewManager.getFragmentByNativeId(nativeID);
if (fragment == null) {
if (fragment == null || fragment.getMapController() == null) {
promise.reject(JsErrors.NO_MAP_ERROR_CODE, JsErrors.NO_MAP_ERROR_MESSAGE);
return;
}
Expand All @@ -345,7 +345,7 @@ public void removeCircle(String nativeID, String id, final Promise promise) {
UiThreadUtil.runOnUiThread(
() -> {
IMapViewFragment fragment = mNavViewManager.getFragmentByNativeId(nativeID);
if (fragment == null) {
if (fragment == null || fragment.getMapController() == null) {
promise.reject(JsErrors.NO_MAP_ERROR_CODE, JsErrors.NO_MAP_ERROR_MESSAGE);
return;
}
Expand All @@ -360,7 +360,7 @@ public void removeGroundOverlay(String nativeID, String id, final Promise promis
UiThreadUtil.runOnUiThread(
() -> {
IMapViewFragment fragment = mNavViewManager.getFragmentByNativeId(nativeID);
if (fragment == null) {
if (fragment == null || fragment.getMapController() == null) {
promise.reject(JsErrors.NO_MAP_ERROR_CODE, JsErrors.NO_MAP_ERROR_MESSAGE);
return;
}
Expand All @@ -375,7 +375,7 @@ public void setZoomLevel(String nativeID, double level, final Promise promise) {
UiThreadUtil.runOnUiThread(
() -> {
IMapViewFragment fragment = mNavViewManager.getFragmentByNativeId(nativeID);
if (fragment == null) {
if (fragment == null || fragment.getMapController() == null) {
promise.reject(JsErrors.NO_MAP_ERROR_CODE, JsErrors.NO_MAP_ERROR_MESSAGE);
return;
}
Expand Down Expand Up @@ -410,7 +410,7 @@ public void setFollowingPerspective(
UiThreadUtil.runOnUiThread(
() -> {
IMapViewFragment fragment = mNavViewManager.getFragmentByNativeId(nativeID);
if (fragment == null) {
if (fragment == null || fragment.getMapController() == null) {
promise.reject(JsErrors.NO_MAP_ERROR_CODE, JsErrors.NO_MAP_ERROR_MESSAGE);
return;
}
Expand All @@ -432,7 +432,7 @@ public void getMarkers(String nativeID, final Promise promise) {
UiThreadUtil.runOnUiThread(
() -> {
IMapViewFragment fragment = mNavViewManager.getFragmentByNativeId(nativeID);
if (fragment == null) {
if (fragment == null || fragment.getMapController() == null) {
promise.reject(JsErrors.NO_MAP_ERROR_CODE, JsErrors.NO_MAP_ERROR_MESSAGE);
return;
}
Expand All @@ -452,7 +452,7 @@ public void getCircles(String nativeID, final Promise promise) {
UiThreadUtil.runOnUiThread(
() -> {
IMapViewFragment fragment = mNavViewManager.getFragmentByNativeId(nativeID);
if (fragment == null) {
if (fragment == null || fragment.getMapController() == null) {
promise.reject(JsErrors.NO_MAP_ERROR_CODE, JsErrors.NO_MAP_ERROR_MESSAGE);
return;
}
Expand All @@ -472,7 +472,7 @@ public void getPolylines(String nativeID, final Promise promise) {
UiThreadUtil.runOnUiThread(
() -> {
IMapViewFragment fragment = mNavViewManager.getFragmentByNativeId(nativeID);
if (fragment == null) {
if (fragment == null || fragment.getMapController() == null) {
promise.reject(JsErrors.NO_MAP_ERROR_CODE, JsErrors.NO_MAP_ERROR_MESSAGE);
return;
}
Expand All @@ -492,7 +492,7 @@ public void getPolygons(String nativeID, final Promise promise) {
UiThreadUtil.runOnUiThread(
() -> {
IMapViewFragment fragment = mNavViewManager.getFragmentByNativeId(nativeID);
if (fragment == null) {
if (fragment == null || fragment.getMapController() == null) {
promise.reject(JsErrors.NO_MAP_ERROR_CODE, JsErrors.NO_MAP_ERROR_MESSAGE);
return;
}
Expand All @@ -512,7 +512,7 @@ public void getGroundOverlays(String nativeID, final Promise promise) {
UiThreadUtil.runOnUiThread(
() -> {
IMapViewFragment fragment = mNavViewManager.getFragmentByNativeId(nativeID);
if (fragment == null) {
if (fragment == null || fragment.getMapController() == null) {
promise.reject(JsErrors.NO_MAP_ERROR_CODE, JsErrors.NO_MAP_ERROR_MESSAGE);
return;
}
Expand Down
Loading