mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed Date Issues in Explore Activity (#2371)

Browse source 
* Initial commit

* Fixed Issue #2362

* unused nodes
This commit is contained in:
Vanshika Arora 2019-01-30 10:24:14 +05:30 • committed by Vivek Maskara
parent f38feda896
commit dc5bca113b
1 changed files with 10 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

26
app/src/main/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApi.java
View file

@ -752,11 +752,9 @@ public class ApacheHttpClientMediaWikiApi implements MediaWikiApi {
@Override @Override
@NonNull @NonNull
public List<Media> searchImages(String query, int offset) { public List<Media> searchImages(String query, int offset) {
List<CustomApiResult> imageNodes = null; CustomApiResult apiResult=null;
List<CustomApiResult> authorNodes = null;
CustomApiResult customApiResult;
try { try {
customApiResult= api.action("query") apiResult= api.action("query")
.param("format", "xml") .param("format", "xml")
.param("generator", "search") .param("generator", "search")
.param("gsrwhat", "text") .param("gsrwhat", "text")
@ -765,26 +763,22 @@ public class ApacheHttpClientMediaWikiApi implements MediaWikiApi {
.param("gsroffset",offset) .param("gsroffset",offset)
.param("gsrsearch", query) .param("gsrsearch", query)
.param("prop", "imageinfo") .param("prop", "imageinfo")
.param("iiprop", "url|extmetadata")
.get(); .get();
imageNodes= customApiResult.getNodes("/api/query/pages/page/@title");
authorNodes= customApiResult.getNodes("/api/query/pages/page/imageinfo/ii/@user");
} catch (IOException e) { } catch (IOException e) {
Timber.e(e, "Failed to obtain searchImages"); Timber.e(e, "Failed to obtain searchImages");
} }
if (imageNodes == null) { CustomApiResult searchImagesNode = apiResult.getNode("/api/query/pages");
if (searchImagesNode == null
|| searchImagesNode.getDocument() == null
|| searchImagesNode.getDocument().getChildNodes() == null
|| searchImagesNode.getDocument().getChildNodes().getLength() == 0) {
return new ArrayList<>(); return new ArrayList<>();
} }
List<Media> images = new ArrayList<>(); NodeList childNodes = searchImagesNode.getDocument().getChildNodes();
return CategoryImageUtils.getMediaList(childNodes);
for (int i=0; i< imageNodes.size();i++){
String imgName = imageNodes.get(i).getDocument().getTextContent();
Media media = new Media(imgName);
media.setCreator(authorNodes.get(i).getDocument().getTextContent());
images.add(media);
}
return images;
} }
/** /**