Fetch and use thumbnail across the app (commons-app#2906)

Author: maskaravivek

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

@@ -42,6 +42,7 @@ public Media[] newArray(int i) {
 
     // Primary metadata fields
     protected Uri localUri;
+    private String thumbUrl;
     protected String imageUrl;
     protected String filename;
     protected String description; // monolingual description on input...
@@ -93,6 +94,7 @@ public Media(Uri localUri, String imageUrl, String filename, String description,
                  long dataLength, Date dateCreated, Date dateUploaded, String creator) {
         this();
         this.localUri = localUri;
+        this.thumbUrl = imageUrl;
         this.imageUrl = imageUrl;
         this.filename = filename;
         this.description = description;
@@ -107,6 +109,7 @@ public Media(Uri localUri, String imageUrl, String filename, String description,
     @SuppressWarnings("unchecked")
     public Media(Parcel in) {
         localUri = in.readParcelable(Uri.class.getClassLoader());
+        thumbUrl = in.readString();
         imageUrl = in.readString();
         filename = in.readString();
         description = in.readString();
@@ -124,6 +127,67 @@ public Media(Parcel in) {
         descriptions = in.readHashMap(ClassLoader.getSystemClassLoader());
     }
 
+    /**
+     * Creating Media object from MWQueryPage.
+     * Earlier only basic details were set for the media object but going forward,
+     * a full media object(with categories, descriptions, coordinates etc) can be constructed using this method
+     *
+     * @param page response from the API
+     * @return Media object
+     */
+    @Nullable
+    public static Media from(MwQueryPage page) {
+        ImageInfo imageInfo = page.imageInfo();
+        if (imageInfo == null) {
+            return null;
+        }
+        ExtMetadata metadata = imageInfo.getMetadata();
+        if (metadata == null) {
+            Media media = new Media(null, imageInfo.getOriginalUrl(),
+                    page.title(), "", 0, null, null, null);
+            if (!StringUtils.isBlank(imageInfo.getThumbUrl())) {
+                media.setThumbUrl(imageInfo.getThumbUrl());
+            }
+            return media;
+        }
+
+        Media media = new Media(null,
+                imageInfo.getOriginalUrl(),
+                page.title(),
+                "",
+                0,
+                safeParseDate(metadata.dateTimeOriginal().value()),
+                safeParseDate(metadata.dateTime().value()),
+                StringUtil.fromHtml(metadata.artist().value()).toString()
+        );
+
+        if (!StringUtils.isBlank(imageInfo.getThumbUrl())) {
+            media.setThumbUrl(imageInfo.getThumbUrl());
+        }
+
+        String language = Locale.getDefault().getLanguage();
+        if (StringUtils.isBlank(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();
+
+        if (!StringUtils.isBlank(latitude) && !StringUtils.isBlank(longitude)) {
+            LatLng latLng = new LatLng(Double.parseDouble(latitude), Double.parseDouble(longitude), 0);
+            media.setCoordinates(latLng);
+        }
+
+        media.setLicenseInformation(metadata.licenseShortName().value(), metadata.licenseUrl().value());
+        return media;
+    }
+
+    public String getThumbUrl() {
+        return thumbUrl;
+    }
+
     /**
      * Gets tag of media
      * @param key Media key
@@ -322,53 +386,8 @@ public String getLicense() {
         return license;
     }
 
-    /**
-     * Creating Media object from MWQueryPage.
-     * Earlier only basic details were set for the media object but going forward,
-     * a full media object(with categories, descriptions, coordinates etc) can be constructed using this method
-     *
-     * @param page response from the API
-     * @return Media object
-     */
-    @Nullable
-    public static Media from(MwQueryPage page) {
-        ImageInfo imageInfo = page.imageInfo();
-        if (imageInfo == null) {
-            return null;
-        }
-        ExtMetadata metadata = imageInfo.getMetadata();
-        if (metadata == null) {
-            return new Media(null, imageInfo.getOriginalUrl(),
-                    page.title(), "", 0, null, null, null);
-        }
-
-        Media media = new Media(null,
-                imageInfo.getOriginalUrl(),
-                page.title(),
-                "",
-                0,
-                safeParseDate(metadata.dateTimeOriginal().value()),
-                safeParseDate(metadata.dateTime().value()),
-                StringUtil.fromHtml(metadata.artist().value()).toString()
-        );
-
-        String language = Locale.getDefault().getLanguage();
-        if (StringUtils.isBlank(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();
-
-        if (!StringUtils.isBlank(latitude) && !StringUtils.isBlank(longitude)) {
-            LatLng latLng = new LatLng(Double.parseDouble(latitude), Double.parseDouble(longitude), 0);
-            media.setCoordinates(latLng);
-        }
-
-        media.setLicenseInformation(metadata.licenseShortName().value(), metadata.licenseUrl().value());
-        return media;
+    public void setThumbUrl(String thumbUrl) {
+        this.thumbUrl = thumbUrl;
     }
 
     public String getLicenseUrl() {
@@ -482,6 +501,7 @@ public int describeContents() {
     @Override
     public void writeToParcel(Parcel parcel, int flags) {
         parcel.writeParcelable(localUri, flags);
+        parcel.writeString(thumbUrl);
         parcel.writeString(imageUrl);
         parcel.writeString(filename);
         parcel.writeString(description);

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

@@ -1,7 +1,5 @@
 package fr.free.nrw.commons;
 
-import android.text.Html;
-
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
@@ -36,7 +34,7 @@ public MediaDataExtractor(MediaWikiApi mwApi,
      * @return full Media object with all details including deletion status and talk page
      */
     public Single<Media> fetchMediaDetails(String filename) {
-        Single<Media> mediaSingle = okHttpJsonApiClient.getMedia(filename, false);
+        Single<Media> mediaSingle = getMediaFromFileName(filename);
         Single<Boolean> pageExistsSingle = mediaWikiApi.pageExists("Commons:Deletion_requests/" + filename);
         Single<String> discussionSingle = getDiscussion(filename);
         return Single.zip(mediaSingle, pageExistsSingle, discussionSingle, (media, deletionStatus, discussion) -> {
@@ -48,6 +46,15 @@ public Single<Media> fetchMediaDetails(String filename) {
         });
     }
 
+    /**
+     * Method can be used to fetch media for a given filename
+     * @param filename Eg. File:Test.jpg
+     * @return return data rich Media object
+     */
+    public Single<Media> getMediaFromFileName(String filename) {
+        return okHttpJsonApiClient.getMedia(filename, false);
+    }
+
     /**
      * Fetch talk page from the MediaWiki API
      * @param filename

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

@@ -8,12 +8,13 @@
 import android.widget.ArrayAdapter;
 import android.widget.TextView;
 
+import com.facebook.drawee.view.SimpleDraweeView;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
 import fr.free.nrw.commons.Media;
-import fr.free.nrw.commons.MediaWikiImageView;
 import fr.free.nrw.commons.R;
 
 /**
@@ -82,12 +83,12 @@ public View getView(int position, View convertView, ViewGroup parent) {
         }
 
         Media item = data.get(position);
-        MediaWikiImageView imageView = convertView.findViewById(R.id.categoryImageView);
+        SimpleDraweeView imageView = convertView.findViewById(R.id.categoryImageView);
         TextView fileName = convertView.findViewById(R.id.categoryImageTitle);
         TextView author = convertView.findViewById(R.id.categoryImageAuthor);
         fileName.setText(item.getDisplayTitle());
         setAuthorView(item, author);
-        imageView.setMedia(item);
+        imageView.setImageURI(item.getThumbUrl());
         return convertView;
     }