From 9a66a74a4962b6cb660cb6fcc77125034db74c3f Mon Sep 17 00:00:00 2001 From: Sujal-Gupta-SG Date: Sat, 1 Feb 2025 18:01:07 +0530 Subject: [PATCH] correct --- .../main/java/fr/free/nrw/commons/upload/UploadClient.kt | 3 --- .../fr/free/nrw/commons/upload/worker/UploadWorker.kt | 8 ++------ .../java/fr/free/nrw/commons/wikidata/WikiBaseClient.kt | 2 +- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadClient.kt b/app/src/main/java/fr/free/nrw/commons/upload/UploadClient.kt index fe8db6187..f5834b7b8 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadClient.kt +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadClient.kt @@ -269,11 +269,8 @@ class UploadClient uniqueFileName!!, fileKey!!, ).map { uploadResponse: JsonObject? -> - Timber.d(uploadResponse.toString()) val uploadResult = gson.fromJson(uploadResponse, UploadResponse::class.java) - if (uploadResult.upload == null) { - // Parse the error to MwException val exception = gson.fromJson(uploadResponse, MwException::class.java) Timber.e(exception, "Error in uploading file from stash") diff --git a/app/src/main/java/fr/free/nrw/commons/upload/worker/UploadWorker.kt b/app/src/main/java/fr/free/nrw/commons/upload/worker/UploadWorker.kt index f425fe78f..b34759ce0 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/worker/UploadWorker.kt +++ b/app/src/main/java/fr/free/nrw/commons/upload/worker/UploadWorker.kt @@ -469,21 +469,18 @@ class UploadWorker( contribution: Contribution, ) { val wikiDataPlace = contribution.wikidataPlace - if (wikiDataPlace != null) { if (!contribution.hasInvalidLocation()) { var revisionID: Long? = null try { - // Always attempt to update the image claim with the latest photo - revisionID = wikidataEditService.createClaim( + revisionID = + wikidataEditService.createClaim( wikiDataPlace, uploadResult.filename, contribution.media.captions, ) - if (null != revisionID) { withContext(Dispatchers.IO) { - // Fetch and update place details val place = placesRepository.fetchPlace(wikiDataPlace.id) place.name = wikiDataPlace.name place.pic = HOME_URL + uploadResult.createCanonicalFileName() @@ -514,7 +511,6 @@ class UploadWorker( } } } - saveCompletedContribution(contribution, uploadResult) } diff --git a/app/src/main/java/fr/free/nrw/commons/wikidata/WikiBaseClient.kt b/app/src/main/java/fr/free/nrw/commons/wikidata/WikiBaseClient.kt index fbfef571f..6e8c6eae6 100644 --- a/app/src/main/java/fr/free/nrw/commons/wikidata/WikiBaseClient.kt +++ b/app/src/main/java/fr/free/nrw/commons/wikidata/WikiBaseClient.kt @@ -38,7 +38,7 @@ class WikiBaseClient * @param filename name of the file * @param data data of the depicts to be uploaded * @return Observable - */ + */ fun postEditEntityByFilename( filename: String?, data: String?,