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

[android] fix: Incorrect search fragment behavior.

Browse source
This commit is contained in:
Alexander Marchuk 2015-11-18 19:56:42 +03:00
parent 87b94399bf
commit 55f1e6e027
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -655,7 +655,7 @@ public class RoutingController
mContainer.updateMenu();
}
private void onPoiSelectedInternal(@Nullable MapObject point)
private void onPoiSelectedInternal(@Nullable MapObject point, int slot)
{
if (mContainer == null)
return;
@ -664,14 +664,10 @@ public class RoutingController
if (point != null)
{
boolean set;
if (mWaitingPoiPickSlot == 1)
set = setStartPoint(point);
if (slot == 1)
setStartPoint(point);
else
set = setEndPoint(point);
if (set)
return;
setEndPoint(point);
}
showRoutePlan();
@ -679,9 +675,10 @@ public class RoutingController
public void onPoiSelected(@Nullable MapObject point)
{
onPoiSelectedInternal(point);
mContainer.updatePoints();
int slot = mWaitingPoiPickSlot;
mWaitingPoiPickSlot = NO_SLOT;
onPoiSelectedInternal(point, slot);
mContainer.updatePoints();
}
public static CharSequence formatRoutingTime(int seconds)

4
android/src/com/mapswithme/maps/search/SearchFragment.java
View file

@ -475,8 +475,12 @@ public class SearchFragment extends BaseMwmFragment
return true;
}
mToolbarController.deactivate();
if (mFromRoutePlan)
{
RoutingController.get().onPoiSelected(null);
return true;
}
return false;
}