kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[android] improve pp attach country behavior

Browse source 
Signed-off-by: Arnaud Vergnet <arnaud.vergnet@mailo.com>
This commit is contained in:
Arnaud Vergnet 2023-05-15 11:19:07 +02:00 • committed by Alexander Borsuk
parent acdff4145b
commit 62db098ee2
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
android/src/app/organicmaps/widget/placepage/PlacePageView.java
View file

@ -246,7 +246,6 @@ public class PlacePageView extends Fragment implements View.OnClickListener,
super.onStart();
mViewModel.getMapObject().observe(requireActivity(), this);
LocationHelper.INSTANCE.addListener(this);
setCurrentCountry();
}
@Override
@ -260,7 +259,7 @@ public class PlacePageView extends Fragment implements View.OnClickListener,
private void setCurrentCountry()
{
if (mCurrentCountry != null || mMapObject == null)
if (mCurrentCountry != null)
return;
String country = MapManager.nativeGetSelectedCountry();
if (country != null && !RoutingController.get().isNavigating())
@ -601,11 +600,11 @@ public class PlacePageView extends Fragment implements View.OnClickListener,
{
if (mapObject == null)
return;
// Starting the download will fire this callback but the object will be the same
// Detaching the country in that case will crash the app
if (!mapObject.sameAs(mMapObject))
{
detachCountry();
setCurrentCountry();
}
setCurrentCountry();
mMapObject = mapObject;