Fix NPE when PlatformUtil.getOsmandRegions is not ready

osmandapp · Nov 19, 2024 · 7fc188b · 7fc188b
1 parent 5641b51
commit 7fc188b
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/OsmAnd/src/net/osmand/plus/auto/NavigationSession.java b/OsmAnd/src/net/osmand/plus/auto/NavigationSession.java
@@ -79,6 +79,7 @@
 import net.osmand.util.GeoPointParserUtil;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
 
@@ -704,8 +705,12 @@ public void onProgress(@NonNull AppInitializer init, @NonNull AppInitEvents even
 						}
 					}
 					if (event == ROUTING_CONFIG_INITIALIZED) {
-						if (app.getRegions() != null) {
-							restoreNavigationHelper.checkRestoreRoutingMode();
+						try {
+							if (PlatformUtil.getOsmandRegions() != null) {
+								restoreNavigationHelper.checkRestoreRoutingMode();
+							}
+						} catch (IOException e) {
+							LOG.warn("NavigateSession getOsmandRegions failed", e);
 						}
 					}
 				}

diff --git a/OsmAnd/src/net/osmand/plus/routing/RouteRecalculationHelper.java b/OsmAnd/src/net/osmand/plus/routing/RouteRecalculationHelper.java
@@ -5,6 +5,7 @@
 import androidx.annotation.NonNull;
 
 import net.osmand.Location;
+import net.osmand.PlatformUtil;
 import net.osmand.data.LatLon;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
@@ -15,6 +16,9 @@
 import net.osmand.router.RouteCalculationProgress;
 import net.osmand.util.Algorithms;
 
+import org.apache.commons.logging.Log;
+
+import java.io.IOException;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
@@ -30,6 +34,7 @@
 import java.util.concurrent.TimeUnit;
 
 class RouteRecalculationHelper {
+	private static final Log LOG = PlatformUtil.getLog(RouteRecalculationHelper.class);
 
 	private static final int RECALCULATE_THRESHOLD_COUNT_CAUSING_FULL_RECALCULATE = 3;
 	private static final int RECALCULATE_THRESHOLD_CAUSING_FULL_RECALCULATE_INTERVAL = 2 * 60 * 1000;
@@ -217,6 +222,16 @@ public void recalculateRouteInBackground(Location start, LatLon end, List<LatLon
 		if (start == null || end == null) {
 			return;
 		}
+		try {
+			if (PlatformUtil.getOsmandRegions() == null || !app.getAppInitializer().isRoutingConfigInitialized()) {
+				String awaitInitializationMessage = app.getString(R.string.waiting_for_route_calculation);
+				app.runInUIThread(() -> app.showToastMessage(awaitInitializationMessage));
+				LOG.warn("recalculateRouteInBackground requires getOsmandRegions");
+				return; // will be retried automatically
+			}
+		} catch (IOException e) {
+			LOG.warn("recalculateRouteInBackground getOsmandRegions failed", e);
+		}
 		// do not evaluate very often
 		if ((!isRouteBeingCalculated() && System.currentTimeMillis() - lastTimeEvaluatedRoute > evalWaitInterval)
 				|| paramsChanged || !onlyStartPointChanged) {