Merge pull request #6289 from alexzatsepin/fix-removing-stop-pointbeta-871beta-870beta-869master-subway

[android] Fixed removing the start or finish point

1 files changed, 7 insertions, 7 deletions

diff --git a/android/src/com/mapswithme/maps/routing/RoutingController.java b/android/src/com/mapswithme/maps/routing/RoutingController.java
index 3dba3c21ee..7573a2d119 100644
--- a/android/src/com/mapswithme/maps/routing/RoutingController.java
+++ b/android/src/com/mapswithme/maps/routing/RoutingController.java
@@ -179,6 +179,13 @@ public class RoutingController
       return;
     }
 
+    if (mLastResultCode == ResultCodesHelper.CANCELLED)
+    {
+      setBuildState(BuildState.NONE);
+      updatePlan();
+      return;
+    }
+
     if (!ResultCodesHelper.isMoreMapsNeeded(mLastResultCode))
     {
       setBuildState(BuildState.ERROR);
@@ -277,13 +284,6 @@ public class RoutingController
   {
     Framework.nativeRemoveRoute();
 
-    RouteMarkData[] routePoints = Framework.nativeGetRoutePoints();
-    if (routePoints.length < 2)
-    {
-      setBuildState(BuildState.NONE);
-      return;
-    }
-
     mLogger.d(TAG, "build");
     mUberRequestHandled = false;
     mLastBuildProgress = 0;