Convert download code to kotlin (commons-app#3665)

Author: maskaravivek

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

@@ -26,34 +26,27 @@
 import fr.free.nrw.commons.bookmarks.Bookmark;
 import fr.free.nrw.commons.bookmarks.pictures.BookmarkPicturesContentProvider;
 import fr.free.nrw.commons.bookmarks.pictures.BookmarkPicturesDao;
+import fr.free.nrw.commons.category.CategoryImagesCallback;
 import fr.free.nrw.commons.contributions.Contribution;
 import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
-import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient;
+import fr.free.nrw.commons.kvstore.JsonKvStore;
 import fr.free.nrw.commons.utils.DownloadUtils;
 import fr.free.nrw.commons.utils.ImageUtils;
 import fr.free.nrw.commons.utils.NetworkUtils;
 import fr.free.nrw.commons.utils.ViewUtil;
-import io.reactivex.disposables.CompositeDisposable;
-import java.util.Objects;
 import javax.inject.Inject;
+import javax.inject.Named;
 import timber.log.Timber;
 
 public class MediaDetailPagerFragment extends CommonsDaggerSupportFragment implements ViewPager.OnPageChangeListener {
 
+    @Inject SessionManager sessionManager;
+    @Inject @Named("default_preferences") JsonKvStore store;
     @Inject BookmarkPicturesDao bookmarkDao;
 
-    @Inject
-    protected OkHttpJsonApiClient okHttpJsonApiClient;
-
-    @Inject
-    protected SessionManager sessionManager;
-
-    private static CompositeDisposable compositeDisposable = new CompositeDisposable();
-
     @BindView(R.id.mediaDetailsPager) ViewPager pager;
     private Boolean editable;
     private boolean isFeaturedImage;
-    private boolean isWikipediaButtonDisplayed;
     MediaDetailAdapter adapter;
     private Bookmark bookmark;
     private MediaDetailProvider provider;
@@ -172,10 +165,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 // Set wallpaper
                 setWallpaper(m);
                 return true;
-            case R.id.menu_set_as_avatar:
-                // Set avatar
-                setAvatar(m);
-                return true;
             default:
                 return super.onOptionsItemSelected(item);
         }
@@ -194,20 +183,6 @@ private void setWallpaper(Media media) {
         ImageUtils.setWallpaperFromImageUrl(getActivity(), Uri.parse(media.getImageUrl()));
     }
 
-    /**
-     * Set the media as user's leaderboard avatar
-     * @param media
-     */
-    private void setAvatar(Media media) {
-        if (media.getImageUrl() == null || media.getImageUrl().isEmpty()) {
-            Timber.d("Media URL not present");
-            return;
-        }
-        ImageUtils.setAvatarFromImageUrl(getActivity(), media.getImageUrl(),
-            Objects.requireNonNull(sessionManager.getCurrentAccount()).name,
-            okHttpJsonApiClient, compositeDisposable);
-    }
-
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         if (!editable) { // Disable menu options for editable views
@@ -219,8 +194,7 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
                     return;
                 }
 
-                final int position = pager.getCurrentItem();
-                Media m = provider.getMediaAtPosition(position);
+                Media m = provider.getMediaAtPosition(pager.getCurrentItem());
                 if (m != null) {
                     // Enable default set of actions, then re-enable different set of actions only if it is a failed contrib
                     menu.findItem(R.id.menu_browser_current_image).setEnabled(true).setVisible(true);
@@ -236,9 +210,10 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
                             BookmarkPicturesContentProvider.uriForName(m.getFilename())
                     );
                     updateBookmarkState(menu.findItem(R.id.menu_bookmark_current_image));
-                    final Integer contributionState = provider.getContributionStateAt(position);
-                    if (contributionState != null) {
-                        switch (contributionState) {
+
+                    if (m instanceof Contribution) {
+                        Contribution c = (Contribution) m;
+                        switch (c.getState()) {
                             case Contribution.STATE_FAILED:
                             case Contribution.STATE_IN_PROGRESS:
                             case Contribution.STATE_QUEUED:
@@ -280,12 +255,6 @@ private void updateBookmarkState(MenuItem item) {
         item.setIcon(icon);
     }
 
-    public void showImage(int i, boolean isWikipediaButtonDisplayed) {
-        this.isWikipediaButtonDisplayed = isWikipediaButtonDisplayed;
-        Handler handler =  new Handler();
-        handler.postDelayed(() -> pager.setCurrentItem(i), 5);
-    }
-
     public void showImage(int i) {
         Handler handler =  new Handler();
         handler.postDelayed(() -> pager.setCurrentItem(i), 5);
@@ -295,9 +264,7 @@ public void showImage(int i) {
      * The method notify the viewpager that number of items have changed.
      */
     public void notifyDataSetChanged(){
-        if (null != adapter) {
-            adapter.notifyDataSetChanged();
-        }
+        adapter.notifyDataSetChanged();
     }
 
     @Override
@@ -306,6 +273,8 @@ public void onPageScrolled(int i, float v, int i2) {
             Timber.d("Returning as activity is destroyed!");
             return;
         }
+        if (i+1 >= adapter.getCount() && getContext() instanceof CategoryImagesCallback)
+            ((CategoryImagesCallback) getContext()).requestMoreImages();
 
         getActivity().invalidateOptionsMenu();
     }
@@ -328,8 +297,6 @@ public interface MediaDetailProvider {
         Media getMediaAtPosition(int i);
 
         int getTotalMediaCount();
-
-        Integer getContributionStateAt(int position);
     }
 
     //FragmentStatePagerAdapter allows user to swipe across collection of images (no. of images undetermined)
@@ -349,7 +316,7 @@ public Fragment getItem(int i) {
                 }
                 pager.postDelayed(() -> getActivity().invalidateOptionsMenu(), 5);
             }
-            return MediaDetailFragment.forMedia(i, editable, isFeaturedImage, isWikipediaButtonDisplayed);
+            return MediaDetailFragment.forMedia(i, editable, isFeaturedImage);
         }
 
         @Override

app/src/main/java/fr/free/nrw/commons/utils/DownloadUtils.kt

@@ -20,22 +20,27 @@ object DownloadUtils {
      */
     @JvmStatic
     fun downloadMedia(activity: Activity?, m: Media) {
-        val imageUrl = m.imageUrl
-        var fileName = m.filename
-        if (imageUrl == null || fileName == null || activity == null) {
-            Timber.d("Skipping download media as either imageUrl $imageUrl or filename $fileName activity is null")
+        val imageUrl = m.getImageUrl()
+        var fileName = m.getFilename()
+        if (imageUrl == null || fileName == null || activity == null
+        ) {
+            Timber.d(
+                "Skipping download media as either imageUrl %s or filename %s activity is null",
+                imageUrl, fileName
+            )
             return
         }
         // Strip 'File:' from beginning of filename, we really shouldn't store it
-        fileName = fileName.substringAfter("File:")
+        fileName = fileName.replaceFirst("^File:".toRegex(), "")
         val imageUri = Uri.parse(imageUrl)
-        val req = DownloadManager.Request(imageUri).apply {
-            setTitle(m.displayTitle)
-            setDescription(activity.getString(R.string.app_name))
-            setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, fileName)
-            allowScanningByMediaScanner()
-            setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED)
-        }
+        val req = DownloadManager.Request(imageUri)
+        //These are not the image title and description fields, they are download descs for notifications
+        req.setDescription(activity.getString(R.string.app_name))
+        req.setTitle(m.displayTitle)
+        req.setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, fileName)
+        // Modern Android updates the gallery automatically. Yay!
+        req.allowScanningByMediaScanner()
+        req.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED)
         PermissionUtils.checkPermissionsAndPerformAction(
             activity,
             permission.WRITE_EXTERNAL_STORAGE,