diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuBuilder.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuBuilder.java index 78d2b67fa7..2ad2bb6ee4 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuBuilder.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuBuilder.java @@ -63,7 +63,6 @@ import net.osmand.plus.mapcontextmenu.controllers.AmenityMenuController; import net.osmand.plus.mapcontextmenu.controllers.TransportStopController; import net.osmand.plus.openplacereviews.AddPhotosBottomSheetDialogFragment; import net.osmand.plus.openplacereviews.OPRConstants; -import net.osmand.plus.openplacereviews.OpenPlaceReviewsPlugin; import net.osmand.plus.openplacereviews.OprStartFragment; import net.osmand.plus.osmedit.opr.OpenDBAPI; import net.osmand.plus.poi.PoiFiltersHelper; @@ -502,7 +501,7 @@ public class MenuBuilder { public void run() { if (AndroidUtils.isActivityNotDestroyed(mapActivity)) { try { - ImageCard imageCard = OpenPlaceReviewsPlugin.createCardOpr(mapActivity, new JSONObject(response)); + ImageCard imageCard = OsmandPlugin.createImageCardForJson(new JSONObject(response)); if (imageCard != null) { addImageCard(imageCard); } diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/cards/ImageCard.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/cards/ImageCard.java index b72fb9d56a..a7e538b211 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/cards/ImageCard.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/cards/ImageCard.java @@ -424,7 +424,6 @@ public abstract class ImageCard extends AbstractCard { protected List doInBackground(Void... voids) { TrafficStats.setThreadStatsTag(GET_IMAGE_CARD_THREAD_ID); List result = new ArrayList<>(); - OsmandPlugin.populateContextMenuImageCards(result, listener); try { final Map pms = new LinkedHashMap<>(); pms.put("lat", "" + (float) latLon.getLatitude()); diff --git a/OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java b/OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java index 05fb1ecffa..1996d8bed5 100644 --- a/OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java +++ b/OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java @@ -238,7 +238,7 @@ public class MapillaryPlugin extends OsmandPlugin { } @Override - protected ImageCard createImageCard(@NonNull JSONObject imageObject) { + protected ImageCard createContextMenuImageCard(@NonNull JSONObject imageObject) { ImageCard imageCard = null; if (mapActivity != null) { try { diff --git a/OsmAnd/src/net/osmand/plus/wikipedia/WikipediaPlugin.java b/OsmAnd/src/net/osmand/plus/wikipedia/WikipediaPlugin.java index cd47444c56..6b5559c3a8 100644 --- a/OsmAnd/src/net/osmand/plus/wikipedia/WikipediaPlugin.java +++ b/OsmAnd/src/net/osmand/plus/wikipedia/WikipediaPlugin.java @@ -447,7 +447,7 @@ public class WikipediaPlugin extends OsmandPlugin { } @Override - protected List getImageCards(@NonNull Map params, @Nullable Map additionalParams, @Nullable GetImageCardsListener listener) { + protected List getContextMenuImageCards(@NonNull Map params, @Nullable Map additionalParams, @Nullable GetImageCardsListener listener) { List imageCards = new ArrayList<>(); if (mapActivity != null) { if (additionalParams != null) {