From f98b49608e00331e9f659e104393b7cba35af525 Mon Sep 17 00:00:00 2001
From: Sonal Yadav <sonal.y6390@gmail.com>
Date: Sat, 5 Jul 2025 09:45:57 +0530
Subject: [PATCH] fix popup from appearing in nearby (#6359)

Co-authored-by: Nicolas Raoul <nicolas.raoul@gmail.com>
---
 .../nrw/commons/upload/mediaDetails/UploadMediaPresenter.kt  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaPresenter.kt b/app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaPresenter.kt
index 77999cf2f..4d565adb2 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaPresenter.kt
+++ b/app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaPresenter.kt
@@ -107,7 +107,10 @@ class UploadMediaPresenter @Inject constructor(
                     view.showProgress(false)
                     val gpsCoords = uploadItem.gpsCoords
                     val hasImageCoordinates = gpsCoords != null && gpsCoords.imageCoordsExists
-                    if (hasImageCoordinates && place == null) {
+                    
+                    // Only check for nearby places if image has coordinates AND no place was pre-selected
+                    // This prevents the popup from appearing when uploading from Nearby feature
+                    if (hasImageCoordinates && place == null && uploadItem.place == null) {
                         checkNearbyPlaces(uploadItem)
                     }
                 }, { throwable: Throwable? ->