pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Added cancellation of Uber panel when user leaves the routing mode

Browse source
This commit is contained in:
alexzatsepin 2016-10-30 23:51:13 +03:00
parent 1592704151
commit 3638f331b6
1 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
android/src/com/mapswithme/maps/routing/RoutingController.java
View file

@ -274,13 +274,8 @@ public class RoutingController
{
if (!mUberInternetConnected)
{
if (mContainer != null)
{
mUberRequestHandled = true;
mContainer.updateBuildProgress(100, mLastRouterType);
mContainer.updateMenu();
return;
}
completeUberRequest();
return;
}
requestUberInfo();
}
@ -294,6 +289,16 @@ public class RoutingController
Framework.nativeBuildRoute(mStartPoint.getLat(), mStartPoint.getLon(), mEndPoint.getLat(), mEndPoint.getLon());
}
private void completeUberRequest()
{
mUberRequestHandled = true;
if (mContainer != null)
{
mContainer.updateBuildProgress(100, mLastRouterType);
mContainer.updateMenu();
}
}
private void showDisclaimer(final MapObject startPoint, final MapObject endPoint)
{
StringBuilder builder = new StringBuilder();
@ -443,6 +448,7 @@ public class RoutingController
mEndPoint = null;
setPointsInternal();
mWaitingPoiPickSlot = NO_SLOT;
mUberRequestHandled = false;
setBuildState(BuildState.NONE);
setState(State.NONE);
@ -827,9 +833,7 @@ public class RoutingController
if (mLastRouterType == Framework.ROUTER_TYPE_TAXI && mContainer != null)
{
mContainer.onUberInfoReceived(info);
mUberRequestHandled = true;
mContainer.updateBuildProgress(100, mLastRouterType);
mContainer.updateMenu();
completeUberRequest();
}
}
@ -846,9 +850,7 @@ public class RoutingController
if (mLastRouterType == Framework.ROUTER_TYPE_TAXI && mContainer != null)
{
mContainer.onUberError(code);
mUberRequestHandled = true;
mContainer.updateBuildProgress(100, mLastRouterType);
mContainer.updateMenu();
completeUberRequest();
}
}
}