Fixes commons-app#4360 (commons-app#4363)

* Trigger API call to addDepictionsAndCaptions after succesfull upload from stash

Author: ashishkumar468

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

@@ -280,6 +280,8 @@ class UploadWorker(var appContext: Context, workerParams: WorkerParameters) :
                                 "Stash Upload success..proceeding to make wikidata edit"
                             )
 
+                            wikidataEditService.addDepictionsAndCaptions(uploadResult, contribution)
+                                .blockingSubscribe();
                             if(contribution.wikidataPlace==null){
                                 Timber.d(
                                     "WikiDataEdit not required, upload success"
@@ -339,7 +341,6 @@ class UploadWorker(var appContext: Context, workerParams: WorkerParameters) :
      * Make the WikiData Edit, if applicable
      */
     private suspend fun makeWikiDataEdit(uploadResult: UploadResult, contribution: Contribution) {
-        wikidataEditService.addDepictionsAndCaptions(uploadResult, contribution)
         val wikiDataPlace = contribution.wikidataPlace
         if (wikiDataPlace != null && wikiDataPlace.imageValue == null) {
             if (!contribution.hasInvalidLocation()) {

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

@@ -179,13 +179,12 @@ public void handleImageClaimResult(final WikidataItem wikidataItem, final Long r
     }
   }
 
-  public Disposable addDepictionsAndCaptions(UploadResult uploadResult, Contribution contribution) {
+  public Observable addDepictionsAndCaptions(final UploadResult uploadResult, final Contribution contribution) {
     return wikiBaseClient.getFileEntityId(uploadResult)
         .doOnError(throwable -> {
           Timber.e(throwable, "Error occurred while getting EntityID to set DEPICTS property");
           ViewUtil.showLongToast(context, context.getString(R.string.wikidata_edit_failure));
         })
-        .subscribeOn(Schedulers.io())
         .switchMap(fileEntityId -> {
               if (fileEntityId != null) {
                 Timber.d("EntityId for image was received successfully: %s", fileEntityId);
@@ -198,9 +197,6 @@ public Disposable addDepictionsAndCaptions(UploadResult uploadResult, Contributi
                 return Observable.empty();
               }
             }
-        ).subscribe(
-            success -> Timber.d("edit response: %s", success),
-            throwable -> Timber.e(throwable, "posting edits failed")
         );
   }