Merge branch 'main' into fix-deletion

Before this change, the labels that would appear on the marker when tapped did not include
the author or username. Instead, it displayed "Unknown".

After this change, the labels now display the author name. If the author name is not
available, the username will be displayed. If both are unavailable, the default value
of "Unknown" will be displayed. To improve the readability of the text, any HTML text
is removed from the username/author.

CHANGELOG.md

@@ -1,5 +1,36 @@
 # Wikimedia Commons for Android
 
+## v5.2.0
+
+v5.2.0 boasts several new functionalities like:
+
+* A new refresh button lets you quickly reload the Nearby map
+* Bookmarks now support categories
+* Improved feedback and consistency in the user interface
+* Bug fixes and performance improvements
+
+### What's changed
+* Implement "Refresh" button to clear the cache and reload the Nearby map.
+* `CommonsApplication` migrate to kotlin & some lint fixes.
+* Revert back to MainScope for database and UI updates and make database operations thread safe.
+* Hide edit options for logged-out users in Explore screen.
+* Introduced a button to delete the current folder in custom selector.
+* Improve Unique File Name Search.
+* Migration of several modules from Java to Kotlin.
+* Fix modification on bottom sheet's data when coming from Nearby Banner and clicked on other pins.
+* Bug fixes and enhancement of Achievements screen.
+* Show where file is being used on Commons and other wikis.
+* Migrate android.media.ExifInterface to androidx.exifinterface.media.ExifInterface as android.media.ExifInterface had security flaws on older devices.
+* Make dialogs modal and always show the upload icon.
+* Fix unintentional deletion of subfolders and non-images by custom selector.
+* Bookmark categories.
+* Add pull down to refresh in the Contributions screen.
+* Fix race condition and lag when loading pin details, faster overlay management.
+* Show cached pins in Nearby even when internet is unavailable
+
+ Full changelog with the list of contributors: [`v5.1.2...v5.2.0`](https://github.com/commons-app/apps-android-commons/compare/v5.1.2...v5.2.0).
+
+
 ## v5.1.2
 
 ### What's changed

app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapFragment.java

@@ -708,8 +708,17 @@ public class ExploreMapFragment extends CommonsDaggerSupportFragment
             GeoPoint point = new GeoPoint(
                 nearbyBaseMarker.getPlace().location.getLatitude(),
                 nearbyBaseMarker.getPlace().location.getLongitude());
-            OverlayItem item = new OverlayItem(nearbyBaseMarker.getPlace().name, null,
-                point);
+
+            Media markerMedia = this.getMediaFromImageURL(nearbyBaseMarker.getPlace().pic);
+            String authorUser = null;
+            if (markerMedia != null) {
+                authorUser = markerMedia.getAuthorOrUser();
+                // HTML text is sometimes part of the author string and needs to be removed
+                authorUser = Html.fromHtml(authorUser, Html.FROM_HTML_MODE_LEGACY).toString();
+            }
+
+            OverlayItem item = new OverlayItem(nearbyBaseMarker.getPlace().name,
+                authorUser, point);
             item.setMarker(d);
             items.add(item);
             ItemizedOverlayWithFocus overlay = new ItemizedOverlayWithFocus(items,
@@ -740,6 +749,26 @@ public class ExploreMapFragment extends CommonsDaggerSupportFragment
         }
     }
 
+    /**
+     * Retrieves the specific Media object from the mediaList field.
+     * @param url The specific Media's image URL.
+     * @return The Media object that matches the URL or null if it could not be found.
+     */
+    private Media getMediaFromImageURL(String url) {
+        if (mediaList == null || url == null) {
+            return null;
+        }
+
+        for (int i = 0; i < mediaList.size(); i++) {
+            if (mediaList.get(i) != null && mediaList.get(i).getImageUrl() != null
+                && mediaList.get(i).getImageUrl().equals(url)) {
+                return mediaList.get(i);
+            }
+        }
+
+        return null;
+    }
+
     /**
      * Removes a marker from the map based on the specified NearbyBaseMarker.
      *