Merge branch 'r3.9'

OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java

@@ -101,6 +101,14 @@ public class MapillaryPlugin extends OsmandPlugin {
 		return app.getString(R.string.mapillary);
 	}
 
+	@Override
+	public boolean init(@NonNull OsmandApplication app, Activity activity) {
+		if (activity instanceof MapActivity) {
+			mapActivity = (MapActivity) activity;
+		}
+		return true;
+	}
+
 	@Override
 	public void registerLayers(MapActivity activity) {
 		createLayers();

OsmAnd/src/net/osmand/plus/openplacereviews/OpenPlaceReviewsPlugin.java

@@ -1,5 +1,6 @@
 package net.osmand.plus.openplacereviews;
 
+import android.app.Activity;
 import android.graphics.drawable.Drawable;
 
 import androidx.annotation.NonNull;
@@ -45,7 +46,6 @@ public class OpenPlaceReviewsPlugin extends OsmandPlugin {
 		return ID;
 	}
 
-
 	@Override
 	public String getName() {
 		return app.getString(R.string.open_place_reviews);
@@ -88,8 +88,8 @@ public class OpenPlaceReviewsPlugin extends OsmandPlugin {
 
 	@Override
 	protected List<ImageCard> getContextMenuImageCards(@NonNull Map<String, String> params,
-											@Nullable Map<String, String> additionalParams,
+													   @Nullable Map<String, String> additionalParams,
-											@Nullable GetImageCardsListener listener) {
+													   @Nullable GetImageCardsListener listener) {
 		List<ImageCard> imageCards = new ArrayList<>();
 		if (mapActivity != null) {
 			Object object = mapActivity.getMapLayers().getContextMenuLayer().getSelectedObject();
@@ -111,6 +111,15 @@ public class OpenPlaceReviewsPlugin extends OsmandPlugin {
 		return imageCards;
 	}
 
+	@Override
+	protected ImageCard createContextMenuImageCard(@NonNull JSONObject imageObject) {
+		ImageCard imageCard = null;
+		if (mapActivity != null && imageObject != JSONObject.NULL) {
+			imageCard = createCardOpr(mapActivity, imageObject);
+		}
+		return imageCard;
+	}
+
 	private void getPicturesForPlace(List<ImageCard> result, String response) {
 		try {
 			if (!Algorithms.isEmpty(response)) {
@@ -171,6 +180,14 @@ public class OpenPlaceReviewsPlugin extends OsmandPlugin {
 		return arr;
 	}
 
+	@Override
+	public boolean init(@NonNull OsmandApplication app, Activity activity) {
+		if (activity instanceof MapActivity) {
+			mapActivity = (MapActivity) activity;
+		}
+		return true;
+	}
+
 	@Override
 	public void disable(OsmandApplication app) {
 		if (app.getSettings().OPR_USE_DEV_URL.get()) {

OsmAnd/src/net/osmand/plus/wikipedia/WikipediaPlugin.java

@@ -1,5 +1,6 @@
 package net.osmand.plus.wikipedia;
 
+import android.app.Activity;
 import android.content.Intent;
 import android.view.View;
 import android.widget.ArrayAdapter;
@@ -106,6 +107,14 @@ public class WikipediaPlugin extends OsmandPlugin {
 		this.mapActivity = null;
 	}
 
+	@Override
+	public boolean init(@NonNull OsmandApplication app, Activity activity) {
+		if (activity instanceof MapActivity) {
+			mapActivity = (MapActivity) activity;
+		}
+		return true;
+	}
+
 	@Override
 	protected void registerLayerContextMenuActions(OsmandMapTileView mapView,
 												   ContextMenuAdapter adapter,