Merge branch 'master' into rxjava

Author: maskaravivek

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

@@ -5,9 +5,11 @@
 import android.os.Parcelable;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -95,6 +97,8 @@ public Media(Uri localUri, String imageUrl, String filename, String description,
         this.dateCreated = dateCreated;
         this.dateUploaded = dateUploaded;
         this.creator = creator;
+        this.categories = new ArrayList<>();
+        this.descriptions = new HashMap<>();
     }
 
     @SuppressWarnings("unchecked")
@@ -460,6 +464,7 @@ public boolean getRequestedDeletion(){
      * @param page response from the API
      * @return Media object
      */
+    @Nullable
     public static Media from(MwQueryPage page) {
         ImageInfo imageInfo = page.imageInfo();
         if(imageInfo == null) {
@@ -471,8 +476,6 @@ public static Media from(MwQueryPage page) {
                     page.title(), "", 0, null, null, null);
         }
 
-        String categories = metadata.categories().value();
-
         Media media = new Media(null,
                 imageInfo.getOriginalUrl(),
                 page.title(),
@@ -483,9 +486,12 @@ public static Media from(MwQueryPage page) {
                 StringUtils.getParsedStringFromHtml(metadata.artist().value())
         );
 
-        media.setDescriptions(metadata.imageDescription().value());
-        media.setCategories(MediaDataExtractorUtil.extractCategoriesFromList(categories));
-
+        String language = Locale.getDefault().getLanguage();
+        if (StringUtils.isNullOrWhiteSpace(language)) {
+            language = "default";
+        }
+        media.setDescriptions(Collections.singletonMap(language, metadata.imageDescription().value()));
+        media.setCategories(MediaDataExtractorUtil.extractCategoriesFromList(metadata.categories().value()));
         String latitude = metadata.gpsLatitude().value();
         String longitude = metadata.gpsLongitude().value();
 
@@ -495,7 +501,6 @@ public static Media from(MwQueryPage page) {
         }
 
         media.setLicense(metadata.licenseShortName().value());
-
         return media;
     }
 }

app/src/main/java/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesController.java

@@ -36,7 +36,7 @@ List<Media> loadBookmarkedPictures() {
         ArrayList<Media> medias = new ArrayList<>();
         for (Bookmark bookmark : bookmarks) {
             List<Media> tmpMedias = okHttpJsonApiClient
-                    .searchImages(bookmark.getMediaName(), 0)
+                    .getMediaList("search", bookmark.getMediaName())
                     .blockingGet();
             for (Media m : tmpMedias) {
                 if (m.getCreator().trim().equals(bookmark.getMediaCreator().trim())) {

app/src/main/java/fr/free/nrw/commons/category/CategoryImageController.java

@@ -6,24 +6,25 @@
 import javax.inject.Singleton;
 
 import fr.free.nrw.commons.Media;
-import fr.free.nrw.commons.mwapi.MediaWikiApi;
+import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient;
+import io.reactivex.Single;
 
 @Singleton
 public class CategoryImageController {
 
-    private MediaWikiApi mediaWikiApi;
+    private OkHttpJsonApiClient okHttpJsonApiClient;
 
     @Inject
-    public CategoryImageController(MediaWikiApi mediaWikiApi) {
-        this.mediaWikiApi = mediaWikiApi;
+    public CategoryImageController(OkHttpJsonApiClient okHttpJsonApiClient) {
+        this.okHttpJsonApiClient = okHttpJsonApiClient;
     }
 
     /**
      * Takes a category name as input and calls the API to get a list of images for that category
      * @param categoryName
      * @return
      */
-    public List<Media> getCategoryImages(String categoryName) {
-        return mediaWikiApi.getCategoryImages(categoryName);
+    public Single<List<Media>> getCategoryImages(String categoryName) {
+        return okHttpJsonApiClient.getMediaList("category", categoryName);
     }
 }

app/src/main/java/fr/free/nrw/commons/category/CategoryImageUtils.java

@@ -1,45 +1,15 @@
 package fr.free.nrw.commons.category;
 
-import androidx.annotation.NonNull;
-
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Date;
 import java.util.List;
 
-import javax.annotation.Nullable;
-
-import fr.free.nrw.commons.Media;
-import fr.free.nrw.commons.utils.StringUtils;
-import timber.log.Timber;
-
 public class CategoryImageUtils {
 
-    /**
-     * The method iterates over the child nodes to return a list of Media objects
-     * @param childNodes
-     * @return
-     */
-    public static List<Media> getMediaList(NodeList childNodes) {
-        List<Media> categoryImages = new ArrayList<>();
-
-        for (int i = 0; i < childNodes.getLength(); i++) {
-            Node node = childNodes.item(i);
-
-            if (getFileName(node).substring(0, 5).equals("File:")) {
-                categoryImages.add(getMediaFromPage(node));
-            }
-        }
-
-        return categoryImages;
-    }
-
     /**
      * The method iterates over the child nodes to return a list of Subcategory name
      * sorted alphabetically
@@ -56,27 +26,6 @@ public static List<String> getSubCategoryList(NodeList childNodes) {
         return subCategories;
     }
 
-    /**
-     * Creates a new Media object from the XML response as received by the API
-     * @param node
-     * @return
-     */
-    public static Media getMediaFromPage(Node node) {
-        Media media = new Media(null,
-                getImageUrl(node),
-                getFileName(node),
-                getDescription(node),
-                getDataLength(node),
-                getDateCreated(node),
-                getDateCreated(node),
-                getCreator(node)
-        );
-
-        media.setLicense(getLicense(node));
-
-        return media;
-    }
-
     /**
      * Extracts the filename of the uploaded image
      * @param document
@@ -87,162 +36,4 @@ private static String getFileName(Node document) {
         return element.getAttribute("title");
     }
 
-    /**
-     * Extracts the image description for that particular upload
-     * @param document
-     * @return
-     */
-    private static String getDescription(Node document) {
-        return getMetaDataValue(document, "ImageDescription");
-    }
-
-    /**
-     * Extracts license information from the image meta data
-     * @param document
-     * @return
-     */
-    private static String getLicense(Node document) {
-        return getMetaDataValue(document, "License");
-    }
-
-    /**
-     * Returns the parsed value of artist from the response
-     * The artist information is returned as a HTML string from the API. Using HTML parser to parse the HTML
-     * @param document
-     * @return
-     */
-    @NonNull
-    private static String getCreator(Node document) {
-        String artist = getMetaDataValue(document, "Artist");
-        if (StringUtils.isNullOrWhiteSpace(artist)) {
-            return "";
-        }
-        return StringUtils.getParsedStringFromHtml(artist);
-    }
-
-    /**
-     * Returns the parsed date of creation of the image
-     * @param document
-     * @return
-     */
-    private static Date getDateCreated(Node document) {
-        String dateTime = getMetaDataValue(document, "DateTime");
-        if (dateTime != null && !dateTime.equals("")) {
-            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            try {
-                return format.parse(dateTime);
-            } catch (ParseException e) {
-                Timber.d("Error occurred while parsing date %s", dateTime);
-                return new Date();
-            }
-        }
-        return new Date();
-    }
-
-    /**
-     * @param document
-     * @return Returns the url attribute from the imageInfo node
-     */
-    private static String getImageUrl(Node document) {
-        Element element = (Element) getImageInfo(document);
-        if (element != null) {
-            return element.getAttribute("url");
-        }
-        return null;
-    }
-
-    /**
-     * Takes the node document and gives out the attribute length from the node document
-     * @param document
-     * @return
-     */
-    private static long getDataLength(Node document) {
-        Element element = (Element) document;
-        if (element != null) {
-            String length = element.getAttribute("length");
-            if (length != null && !length.equals("")) {
-                return Long.parseLong(length);
-            }
-        }
-        return 0L;
-    }
-
-    /**
-     * Generic method to get the value of any meta as returned by the getMetaData function
-     * @param document node document as returned by API
-     * @param metaName the name of meta node to be returned
-     * @return
-     */
-    private static String getMetaDataValue(Node document, String metaName) {
-        Element metaData = getMetaData(document, metaName);
-        if (metaData != null) {
-            return metaData.getAttribute("value");
-        }
-        return null;
-    }
-
-    /**
-     * Generic method to return an element taking the node document and metaName as input
-     * @param document node document as returned by API
-     * @param metaName the name of meta node to be returned
-     * @return
-     */
-    @Nullable
-    private static Element getMetaData(Node document, String metaName) {
-        Node extraMetaData = getExtraMetaData(document);
-        if (extraMetaData != null) {
-            Node node = getNode(extraMetaData, metaName);
-            if (node != null) {
-                return (Element) node;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Extracts extmetadata from the response XML
-     * @param document
-     * @return
-     */
-    @Nullable
-    private static Node getExtraMetaData(Node document) {
-        Node imageInfo = getImageInfo(document);
-        if (imageInfo != null) {
-            return getNode(imageInfo, "extmetadata");
-        }
-        return null;
-    }
-
-    /**
-     * Extracts the ii node from the imageinfo node
-     * @param document
-     * @return
-     */
-    @Nullable
-    private static Node getImageInfo(Node document) {
-        Node imageInfo = getNode(document, "imageinfo");
-        if (imageInfo != null) {
-            return getNode(imageInfo, "ii");
-        }
-        return null;
-    }
-
-    /**
-     * Takes a parent node as input and returns a child node if present
-     * @param node parent node
-     * @param nodeName child node name
-     * @return
-     */
-    @Nullable
-    public static Node getNode(Node node, String nodeName) {
-        NodeList childNodes = node.getChildNodes();
-        for (int i = 0; i < childNodes.getLength(); i++) {
-            Node nodeItem = childNodes.item(i);
-            Element item = (Element) nodeItem;
-            if (item.getTagName().equals(nodeName)) {
-                return nodeItem;
-            }
-        }
-        return null;
-    }
 }

app/src/main/java/fr/free/nrw/commons/category/CategoryImagesListFragment.java

@@ -2,7 +2,6 @@
 
 import android.annotation.SuppressLint;
 import android.os.Bundle;
-import androidx.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -20,6 +19,7 @@
 import javax.inject.Inject;
 import javax.inject.Named;
 
+import androidx.annotation.Nullable;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import dagger.android.support.DaggerFragment;
@@ -29,7 +29,6 @@
 import fr.free.nrw.commons.kvstore.JsonKvStore;
 import fr.free.nrw.commons.utils.NetworkUtils;
 import fr.free.nrw.commons.utils.ViewUtil;
-import io.reactivex.Observable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.schedulers.Schedulers;
@@ -102,7 +101,7 @@ private void initViews() {
      * @param keyword
      */
     private void resetQueryContinueValues(String keyword) {
-        categoryKvStore.remove(keyword);
+        categoryKvStore.remove("query_continue_" + keyword);
     }
 
     /**
@@ -117,7 +116,7 @@ private void initList() {
 
         isLoading = true;
         progressBar.setVisibility(VISIBLE);
-        compositeDisposable.add(Observable.fromCallable(() -> controller.getCategoryImages(categoryName))
+        compositeDisposable.add(controller.getCategoryImages(categoryName)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .timeout(TIMEOUT_SECONDS, TimeUnit.SECONDS)
@@ -223,7 +222,7 @@ private void fetchMoreImages() {
         }
 
         progressBar.setVisibility(VISIBLE);
-        compositeDisposable.add(Observable.fromCallable(() -> controller.getCategoryImages(categoryName))
+        compositeDisposable.add(controller.getCategoryImages(categoryName)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .timeout(TIMEOUT_SECONDS, TimeUnit.SECONDS)