drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-19 04:53:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Android] Fix crash when selectedCountry is null

Browse Source 
Signed-off-by: map-per <map-per@gmx.de>
This commit is contained in:
map-per
2025-12-13 09:26:43 +01:00
committed by map-per
parent 3bad6d25f0
commit 298518ae72
1 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
View File

@@ -692,6 +692,7 @@ public class PlacePageView extends Fragment
{ {
UiUtils.showIf(Editor.nativeShouldShowEditPlace(), mEditPlace); UiUtils.showIf(Editor.nativeShouldShowEditPlace(), mEditPlace);
UiUtils.showIf(Editor.nativeShouldShowAddPlace(), mAddPlace); UiUtils.showIf(Editor.nativeShouldShowAddPlace(), mAddPlace);
UiUtils.hide(mMapTooOld);
MaterialButton mTvEditPlace = mEditPlace.findViewById(R.id.mb__place_editor); MaterialButton mTvEditPlace = mEditPlace.findViewById(R.id.mb__place_editor);
MaterialButton mTvAddPlace = mAddPlace.findViewById(R.id.mb__place_add); MaterialButton mTvAddPlace = mAddPlace.findViewById(R.id.mb__place_add);
@@ -711,27 +712,32 @@ public class PlacePageView extends Fragment
Utils.showSnackbar(v.getContext(), v.getRootView(), R.string.place_page_too_old_to_edit); Utils.showSnackbar(v.getContext(), v.getRootView(), R.string.place_page_too_old_to_edit);
}); });
CountryItem map = CountryItem.fill(MapManager.nativeGetSelectedCountry()); String countryId = MapManager.nativeGetSelectedCountry();
if (map.status == CountryItem.STATUS_UPDATABLE || map.status == CountryItem.STATUS_DONE if (countryId != null)
|| map.status == CountryItem.STATUS_FAILED)
{ {
mMapTooOld.setVisibility(VISIBLE); CountryItem map = CountryItem.fill(countryId);
MaterialButton mTvUpdateTooOldMap = mMapTooOld.findViewById(R.id.mb__update_too_old_map);
boolean canUpdateMap = map.status != CountryItem.STATUS_DONE;
if (canUpdateMap) if (map.status == CountryItem.STATUS_UPDATABLE || map.status == CountryItem.STATUS_DONE
|| map.status == CountryItem.STATUS_FAILED)
{ {
mTvUpdateTooOldMap.setOnClickListener((v) -> { UiUtils.show(mMapTooOld);
MapManagerHelper.warn3gAndDownload(requireActivity(), map.id, null);
mMapTooOld.setVisibility(GONE); boolean canUpdateMap = map.status != CountryItem.STATUS_DONE;
}); MaterialButton mTvUpdateTooOldMap = mMapTooOld.findViewById(R.id.mb__update_too_old_map);
} UiUtils.showIf(canUpdateMap, mTvUpdateTooOldMap);
else
{
mTvUpdateTooOldMap.setVisibility(GONE);
MaterialTextView mapTooOldDescription = mMapTooOld.findViewById(R.id.tv__map_too_old_description); MaterialTextView mapTooOldDescription = mMapTooOld.findViewById(R.id.tv__map_too_old_description);
mapTooOldDescription.setText(R.string.place_page_app_too_old_description); if (canUpdateMap)
{
mapTooOldDescription.setText(R.string.place_page_map_too_old_description);
mTvUpdateTooOldMap.setOnClickListener((v) -> {
MapManagerHelper.warn3gAndDownload(requireActivity(), map.id, null);
UiUtils.hide(mMapTooOld);
});
}
else
mapTooOldDescription.setText(R.string.place_page_app_too_old_description);
} }
} }
} }