fixed issue commons-app#3111

Author: vanshikaarora

app/src/main/java/fr/free/nrw/commons/MediaDataExtractor.java

@@ -90,7 +90,6 @@ private ArrayList<Map<String, String>> formatDepictions(JsonObject mediaResponse
                     JsonObject depictedItem = (JsonObject) depictionArray.get(i);
                     Map <String, String> depictedObject = new HashMap<>();
                     depictedObject.put("label", depictedItem.get("label").toString().substring(3, depictedItem.get("label").toString().length()-3));
-                    depictedObject.put("url", depictedItem.get("url").toString().substring(3, depictedItem.get("url").toString().length() - 3));
                     depictedObject.put("id", depictedItem.get("id").toString().substring(1, depictedItem.get("id").toString().length() - 1));
                     depictedItemList.add(depictedObject);
                 }

app/src/main/java/fr/free/nrw/commons/media/MediaClient.java

@@ -249,7 +249,7 @@ private JsonObject fetchCaptionandDepictionsFromMediaDetailResponse(MediaDetailR
                         Map<String, LinkedTreeMap> datavalue = (Map<String, LinkedTreeMap>) mainsnak.get("datavalue");
                         LinkedTreeMap value = datavalue.get("value");
                         String id = value.get("id").toString();
-                        JsonObject jsonObject = getLabelForDepiction(id)
+                        JsonObject jsonObject = getLabelForDepiction(id, Locale.getDefault().getLanguage())
                                 .subscribeOn(Schedulers.newThread())
                                 .blockingGet();
                                 jsonArray.add(jsonObject);
@@ -284,21 +284,22 @@ private JsonObject fetchCaptionandDepictionsFromMediaDetailResponse(MediaDetailR
      * @return Json Object having label and wikidata url for the Depiction Entity
      */
 
-    public Single<JsonObject> getLabelForDepiction(String entityId) {
-        return mediaDetailInterface.fetchLabelForWikidata(entityId)
+    public Single<JsonObject> getLabelForDepiction(String entityId, String language) {
+        return mediaDetailInterface.getDepictions(entityId, language)
                 .map(jsonResponse -> {
                     try {
                         if (jsonResponse.get("success").toString().equals("1")) {
-                            JsonArray search = (JsonArray) jsonResponse.get("search");
-                            JsonObject searchElement = (JsonObject) search.get(0);
-                            String label = searchElement.get("label").toString();
-                            String url = searchElement.get("concepturi").toString();
+                            JsonObject entities = (JsonObject) jsonResponse.getAsJsonObject().get("entities");
+                            JsonObject responseObject = (JsonObject) entities.getAsJsonObject().get(entityId);
+                            JsonObject labels = responseObject.getAsJsonObject("labels");
+                            JsonObject languageObject = labels.getAsJsonObject(language);
+                            String label = String.valueOf(languageObject.get("value"));
+
+
                             JsonElement labelJson = new JsonPrimitive(label);
-                            JsonElement urlJson = new JsonPrimitive(url);
                             JsonElement idJson = new JsonPrimitive(entityId);
                             JsonObject jsonObject = new JsonObject();
                             jsonObject.add("label", labelJson);
-                            jsonObject.add("url", urlJson);
                             jsonObject.add("id", idJson);
                             return jsonObject;
                         }

app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java

@@ -347,9 +347,8 @@ private void rebuildDepictionList() {
         depictionContainer.removeAllViews();
         for (int i = 0; i<depictions.size(); i++) {
             String depictionName = depictions.get(i).get("label");
-            String depictionUrl = depictions.get(i).get("url");
             String entityId = depictions.get(i).get("id");
-            View depictLabel = buildDepictLabel(depictionName, depictionUrl, entityId, depictionContainer);
+            View depictLabel = buildDepictLabel(depictionName, entityId, depictionContainer);
             depictionContainer.addView(depictLabel);
         }
     }
@@ -518,7 +517,7 @@ private void rebuildCatList() {
      * Add view to depictions obtained also tapping on depictions should open the url
      */
 
-    private View buildDepictLabel(String depictionName, String depictionUrl, String entityId, LinearLayout depictionContainer) {
+    private View buildDepictLabel(String depictionName, String entityId, LinearLayout depictionContainer) {
         final View item = LayoutInflater.from(getContext()).inflate(R.layout.detail_depicts_item, depictionContainer, false);
         final CompatTextView textView = item.findViewById(R.id.media_detail_depicted_item_text);
 

app/src/main/java/fr/free/nrw/commons/media/MediaDetailInterface.java

@@ -20,6 +20,6 @@ public interface MediaDetailInterface {
     @GET("w/api.php?action=wbgetentities&props=labels&format=json&languagefallback=1&sites=commonswiki")
     Observable<MediaDetailResponse> fetchStructuredDataByFilename(@Query("languages") String language, @Query("titles") String filename);
 
-    @GET("w/api.php?action=wbsearchentities&format=json&language=en")
-    Observable<JsonObject> fetchLabelForWikidata(@Query("search") String entityId);
+    @GET("/w/api.php?format=json&action=wbgetentities&props=labels&languagefallback=1")
+    Observable<JsonObject> getDepictions(@Query("ids") String entityId, @Query("languages") String language);
 }