[android] return to planing state from navigating state if add/remove stopbeta-897

1 files changed, 19 insertions, 0 deletions

diff --git a/android/src/com/mapswithme/maps/routing/RoutingController.java b/android/src/com/mapswithme/maps/routing/RoutingController.java
index 6171b5b0ea..3557f9ff6c 100644
--- a/android/src/com/mapswithme/maps/routing/RoutingController.java
+++ b/android/src/com/mapswithme/maps/routing/RoutingController.java
@@ -442,6 +442,8 @@ public class RoutingController implements TaxiManager.TaxiListener
     build();
     if (mContainer != null)
       mContainer.onAddedStop();
+
+    backToPlaningStateIfNavigating();
   }
 
   public void removeStop(@NonNull MapObject mapObject)
@@ -458,6 +460,23 @@ public class RoutingController implements TaxiManager.TaxiListener
     build();
     if (mContainer != null)
       mContainer.onRemovedStop();
+
+    backToPlaningStateIfNavigating();
+  }
+
+  private void backToPlaningStateIfNavigating()
+  {
+    if (!isNavigating())
+      return;
+
+    setState(State.PREPARE);
+    if (mContainer != null)
+    {
+      mContainer.showNavigation(false);
+      mContainer.showRoutePlan(true, null);
+      mContainer.updateMenu();
+      mContainer.onNavigationCancelled();
+    }
   }
 
   public void removeIntermediatePoints()