Fix AA navigation restored started on the phone (patch)

osmandapp · Nov 22, 2024 · 47a11b3 · 47a11b3
1 parent e9cddcf
commit 47a11b3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 14 deletions.
diff --git a/OsmAnd/src/net/osmand/plus/auto/NavigationSession.java b/OsmAnd/src/net/osmand/plus/auto/NavigationSession.java
@@ -436,6 +436,9 @@ public void startNavigationScreen() {
 		if (routingHelper.isFollowingMode() && routingHelper.isRouteCalculated() && !carNavigationShouldBeActive) {
 			startCarNavigation();
 		}
+		if (routingHelper.isRouteCalculated()) {
+			routingHelper.resumeNavigation(); // to update navigate session immediately with location
+		}
 	}
 
 

diff --git a/OsmAnd/src/net/osmand/plus/auto/screens/LandingScreen.kt b/OsmAnd/src/net/osmand/plus/auto/screens/LandingScreen.kt
@@ -125,15 +125,7 @@ class LandingScreen(
             .setBrowsable(true)
             .setOnClickListener {
                 app.carNavigationSession?.let { carNavigationSession ->
-                    if (app.routingHelper.isRouteCalculated) {
-                        app.routingHelper.resumeNavigation()
-                    }
                     carNavigationSession.startNavigationScreen()
-                    // duplicate code from startNavigation
-//                    val navigationScreen = carNavigationSession.navigationScreen
-//                    navigationScreen?.let {
-//                        screenManager.push(navigationScreen)
-//                    }
                 }
             }
             .build()

diff --git a/OsmAnd/src/net/osmand/plus/auto/screens/POICategoriesScreen.kt b/OsmAnd/src/net/osmand/plus/auto/screens/POICategoriesScreen.kt
@@ -64,12 +64,7 @@ class POICategoriesScreen(
     private fun onClickPOICategory(group: PoiUIFilter) {
         selectedPOIGroup = group
         Handler(Looper.getMainLooper()).post {
-            screenManager.push(
-                POIScreen(
-                    carContext,
-                    settingsAction,
-                    group)
-            )
+            screenManager.push(POIScreen(carContext, settingsAction, group))
         }
     }