[GSoC] Added Click to open user profile for leaderboard (#3887)

* Localisation updates from https://translatewiki.net.

* Localisation updates from https://translatewiki.net.

* #3749 Improve MediaClient UnitTests  (#3846)

* #3468 Switch from RvRenderer to AdapterDelegates - replace SearchDepictionsRenderer

* #3468 Switch from RvRenderer to AdapterDelegates - replace UploadCategoryDepictionsRenderer

* #3468 Switch from RvRenderer to AdapterDelegates - update BaseAdapter to be easier to use

* #3468 Switch from RvRenderer to AdapterDelegates - replace SearchImagesRenderer

* #3468 Switch from RvRenderer to AdapterDelegates - replace SearchCategoriesRenderer

* #3468 Switch from RvRenderer to AdapterDelegates - replace NotificationRenderer

* #3468 Switch from RvRenderer to AdapterDelegates - replace UploadDepictsRenderer

* #3468 Switch from RvRenderer to AdapterDelegates - replace PlaceRenderer

* #3756 Convert SearchDepictionsFragment to use Pagination - convert SearchDepictionsFragment

* #3756 Convert SearchDepictionsFragment to use Pagination - fix presenter unit tests now that view is not nullable - fix Category prefix imports

* #3756 Convert SearchDepictionsFragment to use Pagination - test DataSource related classes

* #3756 Convert SearchDepictionsFragment to use Pagination - reset rx scheduler - ignore failing test

* #3760 Convert SearchCategoriesFragment to use Pagination - extract functionality of pagination to base classes - add category pagination

* #3772 Convert SearchImagesFragment to use Pagination  - convert SearchImagesFragment - tidy up showing the empty view - make search fragments show snackbar with appropriate text

* #3772 Convert SearchImagesFragment to use Pagination  - allow viewpager to load more data

* #3760 remove test that got re-added by merge

* #3760 remove duplicate dependency

* #3772 fix compilation

* #3780 Create media using a combination of Entities & MwQueryResult - construct media with an entity - move fields from media down to contribution - move dynamic fields outside of media - remove unused constructors - remove all unnecessary fetching of captions/descriptions - bump database version

* #3808 Construct media objects that depict an item id correctly - use generator to construct media for DepictedImages

* #3810 Convert DepictedImagesFragment to use Pagination - extract common media paging methods - convert to DepictedImages to use pagination

* #3810 Convert DepictedImagesFragment to use Pagination - rename base classes to better reflect usage

* #3810 Convert DepictedImagesFragment to use Pagination - map to empty result with no pages

* #3810 Convert DepictedImagesFragment to use Pagination - align test with returned values

* #3780 Create media using a combination of Entities & MwQueryResult - update wikicode to align with expected behaviour

* #3780 Create media using a combination of Entities & MwQueryResult - replace old site of thumbnail title with most relevant caption

* #3818 Convert SubDepictionListFragment to use Pagination - replace SubDepictionList with Child and Parent Fragments - replace contracts with simple presenter declarations - move classes to appropriate packages - delete unused network models - delete duplicated paging classes

* #3820 Convert CategoryImagesListFragment to use Pagination - replace CategoryImagesListFragment with CategoriesMediaFragment - disallow the construction of media objects without imageinfo

* #3822 Convert SubCategoryImagesListFragment to use Pagination - convert subcategories - add continuation support in category client - rely on interfaces for callbacks of PageableMediaFragments

* #3822 Convert SubCategoryImagesListFragment to use Pagination - convert parent categories - delete list fragment - creat base class to support continuation requests in clients

* #3822 Convert SubCategoryImagesListFragment to use Pagination - add tests for ParentCategoriesDataSource

* #3822 Convert SubCategoryImagesListFragment to use Pagination - remove no longer applicable test

* #3749 Improve MediaClient UnitTests - test rewrite

* #3749 Improve MediaClient UnitTests - align with buildConfig property

* With pause and resume for uploads (#3858)

* With pause and resume for uploads

* Dispose current upload

* Make pause and resume work

* Check stash validity

* With java docs

* minor

* Localisation updates from https://translatewiki.net.

* Localisation updates from https://translatewiki.net.

* Add nearby presenter unit tests  (#3615)

* init the test file

* Add tests to check if searchthisarea button action and checkbox actions are added after initialize test

* Add tests to locked unlocked nearby cases

* Add tests for null cases in updateMapAndList method

* Add test to check which locations are used to populate places, depending to LocationChangeType

* Add tests to test users position is not followed if blue dot (current location marker) is not visible

* Add tests to decide search this area method visibility on camera move

* Add tests for multi filteirng of placetypes

* add tests for single place type selection too

* Add tests to tests search view focus gain and bottom sheet visibilities

* Add tests for SearchCloseToCurrentLocation

* Remove two unneeded getter and setter for isNearbyLocked, use @VisibleForTesting annotation instead

* Add VisibleForTesting annotation to initializeNearbyOperations method so that it will be private by default

* Add missing tests

* Add tests for map updated case and add missing lines those are being tested

* Add some missind method verifications

* Create real latlang objects isntead of spying them

* Use a real presenter object instead of a spy

* Revert nonneeded @VisibleForTest annotations, instead reach via lockUnlock method

* Reduce code repetitions

* Do not call a test from another test method

* Add some more tests

* Fix minor issues

* Hidden categories are not showed in suggested categories (#3853)

* Localisation updates from https://translatewiki.net.

* Clarify that the caption would also be used as the image title (#3876)

The app uses the fist caption as the file title. This should also
be communicated to the user via the info box as they would not be
aware of it otherwise.

* Localisation updates from https://translatewiki.net.

* Added Click event for leaderboard, Fixed #3886

* Fixed Travis

Co-authored-by: translatewiki.net <l10n-bot@translatewiki.net>
Co-authored-by: Seán Mac Gillicuddy <seantheappdev@gmail.com>
Co-authored-by: Vivek Maskara <maskaravivek@gmail.com>
Co-authored-by: neslihanturan <tur.neslihan@gmail.com>
Co-authored-by: Paulina <63326136+PaulinaQuintero@users.noreply.github.com>
Co-authored-by: Kaartic Sivaraam <kaartic.sivaraam@gmail.com>

Author: 7 people

app/src/main/java/fr/free/nrw/commons/category/CategoryClient.kt

@@ -92,8 +92,9 @@ class CategoryClient @Inject constructor(private val categoryInterface: Category
                 it.query()?.pages() ?: emptyList()
             }
             .map {
-                it.map { page -> page.title().replace(CATEGORY_PREFIX, "") }
+                it.filter {
+                    page -> page.categoryInfo() == null || !page.categoryInfo().isHidden
+                }.map { page -> page.title().replace(CATEGORY_PREFIX, "") }
             }
     }
-
 }

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

@@ -32,7 +32,7 @@ Single<MwQueryResponse> searchCategories(@Query("gsrsearch") String filter,
      * @return
      */
     @GET("w/api.php?action=query&format=json&formatversion=2"
-            + "&generator=allcategories")
+            + "&generator=allcategories&prop=categoryinfo")
     Single<MwQueryResponse> searchCategoriesForPrefix(@Query("gacprefix") String prefix,
                                                           @Query("gaclimit") int itemLimit, @Query("gacoffset") int offset);
 

app/src/main/java/fr/free/nrw/commons/contributions/ChunkInfo.kt

@@ -0,0 +1,36 @@
+package fr.free.nrw.commons.contributions
+
+import android.os.Parcel
+import android.os.Parcelable
+import fr.free.nrw.commons.upload.UploadResult
+import kotlinx.android.parcel.Parcelize
+
+data class ChunkInfo(
+    val uploadResult: UploadResult,
+    val lastChunkIndex: Int
+) : Parcelable {
+    constructor(parcel: Parcel) : this(
+        parcel.readParcelable(UploadResult::class.java.classLoader),
+        parcel.readInt()
+    ) {
+    }
+
+    override fun writeToParcel(parcel: Parcel, flags: Int) {
+        parcel.writeParcelable(uploadResult, flags)
+        parcel.writeInt(lastChunkIndex)
+    }
+
+    override fun describeContents(): Int {
+        return 0
+    }
+
+    companion object CREATOR : Parcelable.Creator<ChunkInfo> {
+        override fun createFromParcel(parcel: Parcel): ChunkInfo {
+            return ChunkInfo(parcel)
+        }
+
+        override fun newArray(size: Int): Array<ChunkInfo?> {
+            return arrayOfNulls(size)
+        }
+    }
+}

app/src/main/java/fr/free/nrw/commons/contributions/Contribution.kt

@@ -25,6 +25,7 @@ data class Contribution constructor(
     val decimalCoords: String? = null,
     var dateCreatedSource: String? = null,
     var wikidataPlace: WikidataPlace? = null,
+    var chunkInfo: ChunkInfo? = null,
     /**
      * @return array list of entityids for the depictions
      */
@@ -36,7 +37,8 @@ data class Contribution constructor(
     var mimeType: String? = null,
     val localUri: Uri? = null,
     var dataLength: Long = 0,
-    var dateCreated: Date? = null
+    var dateCreated: Date? = null,
+    var dateModified: Date? = null
 ) : Parcelable {
 
     fun completeWith(media: Media): Contribution {
@@ -68,6 +70,7 @@ data class Contribution constructor(
         const val STATE_FAILED = 1
         const val STATE_QUEUED = 2
         const val STATE_IN_PROGRESS = 3
+        const val STATE_PAUSED = 4
 
         /**
          * Formatting captions to the Wikibase format for sending labels

app/src/main/java/fr/free/nrw/commons/contributions/ContributionDao.java

@@ -10,6 +10,8 @@
 import androidx.room.Update;
 import io.reactivex.Completable;
 import io.reactivex.Single;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 
 @Dao
@@ -23,7 +25,10 @@ public abstract class ContributionDao {
 
   public Completable save(final Contribution contribution) {
     return Completable
-        .fromAction(() -> saveSynchronous(contribution));
+        .fromAction(() -> {
+          contribution.setDateModified(Calendar.getInstance().getTime());
+          saveSynchronous(contribution);
+        });
   }
 
   @Transaction
@@ -67,6 +72,9 @@ public Completable delete(final Contribution contribution) {
 
   public Completable update(final Contribution contribution) {
     return Completable
-        .fromAction(() -> updateSynchronous(contribution));
+        .fromAction(() -> {
+          contribution.setDateModified(Calendar.getInstance().getTime());
+          updateSynchronous(contribution);
+        });
   }
 }

app/src/main/java/fr/free/nrw/commons/contributions/ContributionViewHolder.java

@@ -43,6 +43,8 @@ public class ContributionViewHolder extends RecyclerView.ViewHolder {
   ImageButton retryButton;
   @BindView(R.id.cancelButton)
   ImageButton cancelButton;
+  @BindView(R.id.pauseResumeButton)
+  ImageButton pauseResumeButton;
 
 
   private int position;
@@ -93,7 +95,11 @@ public void init(final int position, final Contribution contribution) {
       case Contribution.STATE_IN_PROGRESS:
         stateView.setVisibility(View.GONE);
         progressView.setVisibility(View.VISIBLE);
-        imageOptions.setVisibility(View.GONE);
+        addToWikipediaButton.setVisibility(View.GONE);
+        pauseResumeButton.setVisibility(View.VISIBLE);
+        cancelButton.setVisibility(View.GONE);
+        retryButton.setVisibility(View.GONE);
+        imageOptions.setVisibility(View.VISIBLE);
         final long total = contribution.getDataLength();
         final long transferred = contribution.getTransferred();
         if (transferred == 0 || transferred >= total) {
@@ -102,10 +108,23 @@ public void init(final int position, final Contribution contribution) {
           progressView.setProgress((int) (((double) transferred / (double) total) * 100));
         }
         break;
+      case Contribution.STATE_PAUSED:
+        stateView.setVisibility(View.VISIBLE);
+        stateView.setText(R.string.paused);
+        setResume();
+        progressView.setVisibility(View.GONE);
+        cancelButton.setVisibility(View.GONE);
+        retryButton.setVisibility(View.GONE);
+        pauseResumeButton.setVisibility(View.VISIBLE);
+        imageOptions.setVisibility(View.VISIBLE);
+        break;
       case Contribution.STATE_FAILED:
         stateView.setVisibility(View.VISIBLE);
         stateView.setText(R.string.contribution_state_failed);
         progressView.setVisibility(View.GONE);
+        cancelButton.setVisibility(View.VISIBLE);
+        retryButton.setVisibility(View.VISIBLE);
+        pauseResumeButton.setVisibility(View.GONE);
         imageOptions.setVisibility(View.VISIBLE);
         break;
     }
@@ -187,4 +206,34 @@ public void imageClicked() {
   public void wikipediaButtonClicked() {
     callback.addImageToWikipedia(contribution);
   }
+
+  /**
+   * Triggers a callback for pause/resume
+   */
+  @OnClick(R.id.pauseResumeButton)
+  public void onPauseResumeButtonClicked() {
+    if (pauseResumeButton.getTag().toString().equals("pause")) {
+      callback.pauseUpload(contribution);
+      setResume();
+    } else {
+      callback.resumeUpload(contribution);
+      setPaused();
+    }
+  }
+
+  /**
+   * Update pause/resume button to show pause state
+   */
+  private void setPaused() {
+    pauseResumeButton.setImageResource(R.drawable.pause_icon);
+    pauseResumeButton.setTag(R.string.pause);
+  }
+
+  /**
+   * Update pause/resume button to show resume state
+   */
+  private void setResume() {
+    pauseResumeButton.setImageResource(R.drawable.play_icon);
+    pauseResumeButton.setTag(R.string.resume);
+  }
 }

app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java

@@ -1,6 +1,7 @@
 package fr.free.nrw.commons.contributions;
 
 import static fr.free.nrw.commons.contributions.Contribution.STATE_FAILED;
+import static fr.free.nrw.commons.contributions.Contribution.STATE_PAUSED;
 import static fr.free.nrw.commons.contributions.MainActivity.CONTRIBUTIONS_TAB_POSITION;
 import static fr.free.nrw.commons.utils.LengthUtils.formatDistanceBetween;
 
@@ -454,7 +455,7 @@ private void fetchCampaigns() {
     @Override
     public void retryUpload(Contribution contribution) {
         if (NetworkUtils.isInternetConnectionEstablished(getContext())) {
-            if (contribution.getState() == STATE_FAILED && null != uploadService) {
+            if (contribution.getState() == STATE_FAILED || contribution.getState() == STATE_PAUSED && null != uploadService) {
                 uploadService.queue(contribution);
                 Timber.d("Restarting for %s", contribution.toString());
             } else {
@@ -466,6 +467,15 @@ public void retryUpload(Contribution contribution) {
 
     }
 
+    /**
+     * Pauses the upload
+     * @param contribution
+     */
+    @Override
+    public void pauseUpload(Contribution contribution) {
+        uploadService.pauseUpload(contribution);
+    }
+
     /**
      * Replace whatever is in the current contributionsFragmentContainer view with
      * mediaDetailPagerFragment, and preserve previous state in back stack. Called when user selects a

app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListAdapter.java

@@ -78,5 +78,9 @@ public interface Callback {
         void openMediaDetail(int contribution);
 
         void addImageToWikipedia(Contribution contribution);
+
+        void pauseUpload(Contribution contribution);
+
+        void resumeUpload(Contribution contribution);
     }
 }

app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java

@@ -36,6 +36,7 @@
 import javax.inject.Inject;
 import javax.inject.Named;
 import org.wikipedia.dataclient.WikiSite;
+import timber.log.Timber;
 
 /**
  * Created by root on 01.06.2018.
@@ -90,6 +91,7 @@ public class ContributionsListFragment extends CommonsDaggerSupportFragment impl
   private final int SPAN_COUNT_PORTRAIT = 1;
 
 
+  @Override
   public View onCreateView(
       final LayoutInflater inflater, @Nullable final ViewGroup container,
       @Nullable final Bundle savedInstanceState) {
@@ -192,6 +194,7 @@ private void animateFAB(final boolean isFabOpen) {
   /**
    * Shows welcome message if user has no contributions yet i.e. new user.
    */
+  @Override
   public void showWelcomeTip(final boolean shouldShow) {
     noContributionsYet.setVisibility(shouldShow ? VISIBLE : GONE);
   }
@@ -201,10 +204,12 @@ public void showWelcomeTip(final boolean shouldShow) {
    *
    * @param shouldShow True when contributions list should be hidden.
    */
+  @Override
   public void showProgress(final boolean shouldShow) {
     progressBar.setVisibility(shouldShow ? VISIBLE : GONE);
   }
 
+  @Override
   public void showNoContributionsUI(final boolean shouldShow) {
     noContributionsYet.setVisibility(shouldShow ? VISIBLE : GONE);
   }
@@ -263,6 +268,24 @@ public void addImageToWikipedia(Contribution contribution) {
         });
   }
 
+  /**
+   * Pauses the current upload
+   * @param contribution
+   */
+  @Override
+  public void pauseUpload(Contribution contribution) {
+    callback.pauseUpload(contribution);
+  }
+
+  /**
+   * Resumes the current upload
+   * @param contribution
+   */
+  @Override
+  public void resumeUpload(Contribution contribution) {
+    callback.retryUpload(contribution);
+  }
+
   /**
    * Display confirmation dialog with instructions when the user tries to add image to wikipedia
    *
@@ -311,6 +334,8 @@ public interface Callback {
 
     void retryUpload(Contribution contribution);
 
+    void pauseUpload(Contribution contribution);
+
     void showDetail(int position);
   }
 }

app/src/main/java/fr/free/nrw/commons/contributions/ContributionsLocalDataSource.java

@@ -3,6 +3,7 @@
 import androidx.paging.DataSource.Factory;
 import io.reactivex.Completable;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import javax.inject.Inject;

app/src/main/java/fr/free/nrw/commons/db/AppDatabase.kt

@@ -10,7 +10,7 @@ import fr.free.nrw.commons.contributions.ContributionDao
  * The database for accessing the respective DAOs
  *
  */
-@Database(entities = [Contribution::class], version = 4, exportSchema = false)
+@Database(entities = [Contribution::class], version = 5, exportSchema = false)
 @TypeConverters(Converters::class)
 abstract class AppDatabase : RoomDatabase() {
   abstract fun contributionDao(): ContributionDao

app/src/main/java/fr/free/nrw/commons/db/Converters.java

@@ -5,6 +5,7 @@
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import fr.free.nrw.commons.CommonsApplication;
+import fr.free.nrw.commons.contributions.ChunkInfo;
 import fr.free.nrw.commons.di.ApplicationlessInjection;
 import fr.free.nrw.commons.location.LatLng;
 import fr.free.nrw.commons.upload.WikidataPlace;
@@ -82,6 +83,16 @@ public static WikidataPlace stringToWikidataPlace(String wikidataPlace) {
         return readObjectFromString(wikidataPlace, WikidataPlace.class);
     }
 
+    @TypeConverter
+    public static String chunkInfoToString(ChunkInfo chunkInfo) {
+        return writeObjectToString(chunkInfo);
+    }
+
+    @TypeConverter
+    public static ChunkInfo stringToChunkInfo(String chunkInfo) {
+        return readObjectFromString(chunkInfo, ChunkInfo.class);
+    }
+
     @TypeConverter
     public static String depictionListToString(List<DepictedItem> depictedItems) {
         return writeObjectToString(depictedItems);