Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix context menu

Browse source
This commit is contained in:
Victor Shcherb 2020-08-19 18:07:37 +02:00
parent 9f31490793
commit 4d9a7f1056
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
View file

@ -343,7 +343,7 @@ public class MapActivityActions implements DialogProvider {
final double longitude,
final ContextMenuAdapter adapter,
Object selectedObj,
boolean all) {
boolean configureMenu) {
ItemBuilder itemBuilder = new ItemBuilder();
adapter.addItem(itemBuilder
@ -411,7 +411,7 @@ public class MapActivityActions implements DialogProvider {
.setOrder(ADD_GPX_WAYPOINT_ITEM_ORDER)
.setListener(listener).createItem();
if (all) {
if (configureMenu) {
adapter.addItem(addGpxItem);
} else if (selectedObj instanceof WptPt
&& getMyApplication().getSelectedGpxHelper().getSelectedGPXFile((WptPt) selectedObj) != null) {

4
OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java
View file

@ -1062,7 +1062,7 @@ public class MapContextMenu extends MenuTitleController implements StateChangedL
}
}
public ContextMenuAdapter getActionsContextMenuAdapter(boolean all) {
public ContextMenuAdapter getActionsContextMenuAdapter(boolean configure) {
MapActivity mapActivity = getMapActivity();
final ContextMenuAdapter menuAdapter = new ContextMenuAdapter(getMyApplication());
if (mapActivity != null) {
@ -1070,7 +1070,7 @@ public class MapContextMenu extends MenuTitleController implements StateChangedL
for (OsmandMapLayer layer : mapActivity.getMapView().getLayers()) {
layer.populateObjectContextMenu(latLon, getObject(), menuAdapter, mapActivity);
}
mapActivity.getMapActions().addActionsToAdapter(all ? 0 : latLon.getLatitude(), all ? 0 : latLon.getLongitude(), menuAdapter, getObject(), all);
mapActivity.getMapActions().addActionsToAdapter(configure ? 0 : latLon.getLatitude(), configure ? 0 : latLon.getLongitude(), menuAdapter, getObject(), configure);
}
return menuAdapter;
}