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

[android] Removed unnecessary mapobject refresh on activity resume. Callback from core should be fired instead.

Browse source
This commit is contained in:
Dmitry Yunitsky 2016-02-08 13:12:15 +03:00 • committed by Sergey Yershov
parent e62e90f89f
commit 0d52d5a922
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
android/src/com/mapswithme/maps/MwmActivity.java
View file

@ -639,10 +639,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
super.onRestoreInstanceState(savedInstanceState);
if (savedInstanceState.getBoolean(STATE_PP_OPENED))
{
mPlacePage.setMapObject(Framework.nativeGetActiveMapObject(), false);
mPlacePage.setState(State.PREVIEW);
}
if (!mIsFragmentContainer && RoutingController.get().isPlanning())
mRoutingPlanInplaceController.restoreState(savedInstanceState);
@ -784,7 +781,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
invalidateLocationState();
mSearchController.refreshToolbar();
mPlacePage.setMapObject(Framework.nativeGetActiveMapObject(), true);
if (!RoutingController.get().isNavigating())
{
@ -1033,17 +1029,15 @@ public class MwmActivity extends BaseMwmFragmentActivity
object.setTypeName(request.getCallerName(MwmApplication.get()).toString());
}
else if (MapObject.isOfType(MapObject.MY_POSITION, object))
else if (MapObject.isOfType(MapObject.MY_POSITION, object) &&
Framework.nativeIsRoutingActive())
{
if (Framework.nativeIsRoutingActive())
return;
return;
}
setFullscreen(false);
if (MapObject.same(mPlacePage.getMapObject(), object))
return;
mPlacePage.setMapObject(object, false);
mPlacePage.setMapObject(object, true);
mPlacePage.setState(State.PREVIEW);
if (UiUtils.isVisible(mFadeView))