Skip image upload to Wikidata (nearby -> green pins)

app/src/main/java/fr/free/nrw/commons/upload/worker/UploadWorker.kt

@@ -472,7 +472,10 @@ class UploadWorker(
         if (wikiDataPlace != null) {
             if (!contribution.hasInvalidLocation()) {
                 var revisionID: Long? = null
+                val p18WasSkipped = !wikiDataPlace.imageValue.isNullOrBlank()
                 try {
+                    if (!p18WasSkipped) {
+                    // Only set P18 if the place does not already have a picture
                     revisionID =
                         wikidataEditService.createClaim(
                             wikiDataPlace,
@@ -489,9 +492,11 @@ class UploadWorker(
                                 .subscribeOn(Schedulers.io())
                                 .blockingAwait()
                             Timber.d("Updated WikiItem place ${place.name} with image ${place.pic}")
+                            }
                         }
-                        showSuccessNotification(contribution)
                     }
+                    // Always show success notification, whether P18 was set or skipped
+                    showSuccessNotification(contribution)
                 } catch (exception: Exception) {
                     Timber.e(exception)
                 }
@@ -500,6 +505,7 @@ class UploadWorker(
                     wikidataEditService.handleImageClaimResult(
                         contribution.wikidataPlace!!,
                         revisionID,
+                        p18WasSkipped = p18WasSkipped
                     )
                 }
             } else {

app/src/main/java/fr/free/nrw/commons/wikidata/WikidataEditService.kt

@@ -196,13 +196,16 @@ class WikidataEditService @Inject constructor(
         return wikidataClient.setClaim(claim, COMMONS_APP_TAG).blockingSingle()
     }
 
-    fun handleImageClaimResult(wikidataItem: WikidataItem, revisionId: Long?) {
+    fun handleImageClaimResult(wikidataItem: WikidataItem, revisionId: Long?, p18WasSkipped: Boolean = false) {
         if (revisionId != null) {
             wikidataEditListener?.onSuccessfulWikidataEdit()
             showSuccessToast(wikidataItem.name)
-        } else {
+        } else if (!p18WasSkipped) {
             Timber.d("Unable to make wiki data edit for entity %s", wikidataItem)
             showLongToast(context, context.getString(R.string.wikidata_edit_failure))
+        } else {
+            Timber.d("Wikidata edit skipped for entity %s because P18 already exists", wikidataItem)
+            // No error shown to user, as this is not a failure
         }
     }