[GSoC] Merge Leaderboard branch with master

app/build.gradle

@@ -21,7 +21,7 @@ dependencies {
     // Utils
     implementation 'in.yuvi:http.fluent:1.3'
     implementation 'com.google.code.gson:gson:2.8.5'
-    implementation 'com.squareup.okhttp3:okhttp:4.5.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.8.0'
     implementation 'com.squareup.okio:okio:2.2.2'
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
     implementation 'io.reactivex.rxjava2:rxjava:2.2.3'
@@ -42,6 +42,7 @@ dependencies {
     implementation 'com.dinuscxj:circleprogressbar:1.1.1'
     implementation 'com.karumi:dexter:5.0.0'
     implementation "com.jakewharton:butterknife:$BUTTERKNIFE_VERSION"
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
 
     kapt "com.jakewharton:butterknife-compiler:$BUTTERKNIFE_VERSION"
     implementation "com.hannesdorfmann:adapterdelegates4-kotlin-dsl-layoutcontainer:$ADAPTER_DELEGATES_VERSION"
@@ -50,6 +51,7 @@ dependencies {
     testImplementation "androidx.paging:paging-common-ktx:$PAGING_VERSION"
     implementation "androidx.paging:paging-rxjava2-ktx:$PAGING_VERSION"
     implementation "androidx.recyclerview:recyclerview:1.2.0-alpha02"
+    implementation 'com.squareup.okhttp3:okhttp-ws:3.4.1'
 
     // Logging
     implementation 'ch.acra:acra-dialog:5.3.0'
@@ -79,7 +81,7 @@ dependencies {
     testImplementation 'junit:junit:4.13'
     testImplementation 'org.robolectric:robolectric:4.3'
     testImplementation 'androidx.test:core:1.2.0'
-    testImplementation 'com.squareup.okhttp3:mockwebserver:3.12.1'
+    testImplementation "com.squareup.okhttp3:mockwebserver:4.8.0"
     testImplementation "org.powermock:powermock-module-junit4:2.0.0-beta.5"
     testImplementation "org.powermock:powermock-api-mockito2:2.0.0-beta.5"
     testImplementation 'org.mockito:mockito-core:2.23.0'
@@ -94,7 +96,7 @@ dependencies {
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test:rules:1.2.0'
     androidTestImplementation 'androidx.annotation:annotation:1.1.0'
-    androidTestImplementation 'com.squareup.okhttp3:mockwebserver:3.12.1'
+    androidTestImplementation 'com.squareup.okhttp3:mockwebserver:4.8.0'
     androidTestUtil 'androidx.test:orchestrator:1.2.0'
 
     // Debugging
@@ -209,8 +211,8 @@ android {
 
     configurations.all {
         resolutionStrategy.force 'androidx.annotation:annotation:1.0.2'
+        exclude module: 'okhttp-ws'
     }
-
     flavorDimensions 'tier'
     productFlavors {
         prod {

app/src/androidTest/java/fr/free/nrw/commons/AchievementsActivityTest.kt

@@ -7,10 +7,9 @@ import androidx.test.espresso.intent.Intents
 import androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent
 import androidx.test.espresso.intent.rule.IntentsTestRule
 import androidx.test.espresso.matcher.ViewMatchers.withId
-import androidx.test.filters.MediumTest
 import androidx.test.runner.AndroidJUnit4
-import fr.free.nrw.commons.achievements.AchievementsActivity
 import fr.free.nrw.commons.auth.LoginActivity
+import fr.free.nrw.commons.profile.ProfileActivity
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -32,6 +31,6 @@ class AchievementsActivityTest {
         onView(withId(R.id.drawer_layout)).perform(DrawerActions.open())
         onView(withId(R.id.user_icon)).perform(click())
 
-        Intents.intended(hasComponent(AchievementsActivity::class.java.name))
+        Intents.intended(hasComponent(ProfileActivity::class.java.name))
     }
 }

app/src/main/AndroidManifest.xml

@@ -137,8 +137,8 @@
             />
 
         <activity
-            android:name=".achievements.AchievementsActivity"
-            android:label="@string/Achievements" />
+            android:name=".profile.ProfileActivity"
+            android:label="@string/Profile" />
 
         <activity
             android:name=".bookmarks.BookmarksActivity"

app/src/main/java/fr/free/nrw/commons/delete/ReasonBuilder.java

@@ -12,7 +12,7 @@
 
 import fr.free.nrw.commons.Media;
 import fr.free.nrw.commons.R;
-import fr.free.nrw.commons.achievements.FeedbackResponse;
+import fr.free.nrw.commons.profile.achievements.FeedbackResponse;
 import fr.free.nrw.commons.auth.SessionManager;
 import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient;
 import fr.free.nrw.commons.utils.ViewUtilWrapper;

app/src/main/java/fr/free/nrw/commons/di/ActivityBuilderModule.java

@@ -4,7 +4,6 @@
 import dagger.android.ContributesAndroidInjector;
 import fr.free.nrw.commons.AboutActivity;
 import fr.free.nrw.commons.WelcomeActivity;
-import fr.free.nrw.commons.achievements.AchievementsActivity;
 import fr.free.nrw.commons.auth.LoginActivity;
 import fr.free.nrw.commons.auth.SignupActivity;
 import fr.free.nrw.commons.bookmarks.BookmarksActivity;
@@ -15,6 +14,7 @@
 import fr.free.nrw.commons.explore.SearchActivity;
 import fr.free.nrw.commons.explore.ExploreActivity;
 import fr.free.nrw.commons.notification.NotificationActivity;
+import fr.free.nrw.commons.profile.ProfileActivity;
 import fr.free.nrw.commons.review.ReviewActivity;
 import fr.free.nrw.commons.settings.SettingsActivity;
 import fr.free.nrw.commons.upload.UploadActivity;
@@ -68,7 +68,7 @@ public abstract class ActivityBuilderModule {
     abstract ExploreActivity bindExploreActivity();
 
     @ContributesAndroidInjector
-    abstract AchievementsActivity bindAchievementsActivity();
+    abstract ProfileActivity bindAchievementsActivity();
 
     @ContributesAndroidInjector
     abstract BookmarksActivity bindBookmarksActivity();

app/src/main/java/fr/free/nrw/commons/di/FragmentBuilderModule.java

@@ -19,6 +19,8 @@
 import fr.free.nrw.commons.media.MediaDetailFragment;
 import fr.free.nrw.commons.media.MediaDetailPagerFragment;
 import fr.free.nrw.commons.nearby.fragments.NearbyParentFragment;
+import fr.free.nrw.commons.profile.achievements.AchievementsFragment;
+import fr.free.nrw.commons.profile.leaderboard.LeaderboardFragment;
 import fr.free.nrw.commons.review.ReviewImageFragment;
 import fr.free.nrw.commons.settings.SettingsFragment;
 import fr.free.nrw.commons.upload.categories.UploadCategoriesFragment;
@@ -103,4 +105,10 @@ public abstract class FragmentBuilderModule {
 
     @ContributesAndroidInjector
     abstract ParentCategoriesFragment bindParentCategoriesFragment();
+
+    @ContributesAndroidInjector
+    abstract AchievementsFragment bindAchievementsFragment();
+
+    @ContributesAndroidInjector
+    abstract LeaderboardFragment bindLeaderboardFragment();
 }

app/src/main/java/fr/free/nrw/commons/di/NetworkingModule.java

@@ -85,11 +85,13 @@ public HttpLoggingInterceptor provideHttpLoggingInterceptor() {
     public OkHttpJsonApiClient provideOkHttpJsonApiClient(OkHttpClient okHttpClient,
                                                           DepictsClient depictsClient,
                                                           @Named("tools_forge") HttpUrl toolsForgeUrl,
+                                                          @Named("test_tools_forge") HttpUrl testToolsForgeUrl,
                                                           @Named("default_preferences") JsonKvStore defaultKvStore,
                                                           Gson gson) {
         return new OkHttpJsonApiClient(okHttpClient,
                 depictsClient,
                 toolsForgeUrl,
+                testToolsForgeUrl,
                 WIKIDATA_SPARQL_QUERY_URL,
                 BuildConfig.WIKIMEDIA_CAMPAIGNS_URL,
             gson);
@@ -124,6 +126,14 @@ public HttpUrl provideToolsForgeUrl() {
         return HttpUrl.parse(TOOLS_FORGE_URL);
     }
 
+    @Provides
+    @Named("test_tools_forge")
+    @NonNull
+    @SuppressWarnings("ConstantConditions")
+    public HttpUrl provideTestToolsForgeUrl() {
+        return HttpUrl.parse(TEST_TOOLS_FORGE_URL);
+    }
+
     @Provides
     @Singleton
     @Named(NAMED_COMMONS_WIKI_SITE)

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

@@ -22,22 +22,34 @@
 import com.google.android.material.snackbar.Snackbar;
 import fr.free.nrw.commons.Media;
 import fr.free.nrw.commons.R;
+import fr.free.nrw.commons.auth.SessionManager;
 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.contributions.Contribution;
 import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
+import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient;
 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 timber.log.Timber;
 
 public class MediaDetailPagerFragment extends CommonsDaggerSupportFragment implements ViewPager.OnPageChangeListener {
 
     @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;
@@ -160,6 +172,10 @@ 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);
         }
@@ -178,6 +194,20 @@ 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

app/src/main/java/fr/free/nrw/commons/mwapi/OkHttpJsonApiClient.java

@@ -1,16 +1,21 @@
 package fr.free.nrw.commons.mwapi;
 
+import static fr.free.nrw.commons.profile.leaderboard.LeaderboardConstants.LEADERBOARD_END_POINT;
+import static fr.free.nrw.commons.profile.leaderboard.LeaderboardConstants.UPDATE_AVATAR_END_POINT;
+
 import android.text.TextUtils;
 import androidx.annotation.NonNull;
 import com.google.gson.Gson;
-import fr.free.nrw.commons.achievements.FeaturedImages;
-import fr.free.nrw.commons.achievements.FeedbackResponse;
 import fr.free.nrw.commons.campaigns.CampaignResponseDTO;
 import fr.free.nrw.commons.explore.depictions.DepictsClient;
 import fr.free.nrw.commons.location.LatLng;
 import fr.free.nrw.commons.nearby.Place;
 import fr.free.nrw.commons.nearby.model.NearbyResponse;
 import fr.free.nrw.commons.nearby.model.NearbyResultItem;
+import fr.free.nrw.commons.profile.achievements.FeaturedImages;
+import fr.free.nrw.commons.profile.achievements.FeedbackResponse;
+import fr.free.nrw.commons.profile.leaderboard.LeaderboardResponse;
+import fr.free.nrw.commons.profile.leaderboard.UpdateAvatarResponse;
 import fr.free.nrw.commons.upload.FileUtils;
 import fr.free.nrw.commons.upload.structure.depictions.DepictedItem;
 import fr.free.nrw.commons.utils.ConfigUtils;
@@ -40,6 +45,7 @@ public class OkHttpJsonApiClient {
   private final OkHttpClient okHttpClient;
   private final DepictsClient depictsClient;
   private final HttpUrl wikiMediaToolforgeUrl;
+  private final HttpUrl wikiMediaTestToolforgeUrl;
   private final String sparqlQueryUrl;
   private final String campaignsUrl;
   private final Gson gson;
@@ -49,17 +55,105 @@ public class OkHttpJsonApiClient {
   public OkHttpJsonApiClient(OkHttpClient okHttpClient,
       DepictsClient depictsClient,
       HttpUrl wikiMediaToolforgeUrl,
+      HttpUrl wikiMediaTestToolforgeUrl,
       String sparqlQueryUrl,
       String campaignsUrl,
       Gson gson) {
     this.okHttpClient = okHttpClient;
     this.depictsClient = depictsClient;
     this.wikiMediaToolforgeUrl = wikiMediaToolforgeUrl;
+    this.wikiMediaTestToolforgeUrl = wikiMediaTestToolforgeUrl;
     this.sparqlQueryUrl = sparqlQueryUrl;
     this.campaignsUrl = campaignsUrl;
     this.gson = gson;
   }
 
+  /**
+   * The method will gradually calls the leaderboard API and fetches the leaderboard
+   * @param userName username of leaderboard user
+   * @param duration duration for leaderboard
+   * @param category category for leaderboard
+   * @param limit page size limit for list
+   * @param offset offset for the list
+   * @return LeaderboardResponse object
+   */
+  @NonNull
+  public Observable<LeaderboardResponse> getLeaderboard(String userName, String duration, String category, String limit, String offset) {
+    final String fetchLeaderboardUrlTemplate = wikiMediaTestToolforgeUrl
+        + LEADERBOARD_END_POINT;
+    String url = String.format(Locale.ENGLISH,
+        fetchLeaderboardUrlTemplate,
+        userName,
+        duration,
+        category,
+        limit,
+        offset);
+    HttpUrl.Builder urlBuilder = HttpUrl.parse(url).newBuilder();
+    urlBuilder.addQueryParameter("user", userName);
+    urlBuilder.addQueryParameter("duration", duration);
+    urlBuilder.addQueryParameter("category", category);
+    urlBuilder.addQueryParameter("limit", limit);
+    urlBuilder.addQueryParameter("offset", offset);
+    Timber.i("Url %s", urlBuilder.toString());
+    Request request = new Request.Builder()
+        .url(urlBuilder.toString())
+        .build();
+    return Observable.fromCallable(() -> {
+      Response response = okHttpClient.newCall(request).execute();
+      if (response != null && response.body() != null && response.isSuccessful()) {
+        String json = response.body().string();
+        if (json == null) {
+          return new LeaderboardResponse();
+        }
+        Timber.d("Response for leaderboard is %s", json);
+        try {
+          return gson.fromJson(json, LeaderboardResponse.class);
+        } catch (Exception e) {
+          return new LeaderboardResponse();
+        }
+      }
+      return new LeaderboardResponse();
+    });
+  }
+
+  /**
+   * This method will update the leaderboard user avatar
+   * @param username username to update
+   * @param avatar url of the new avatar
+   * @return UpdateAvatarResponse object
+   */
+  @NonNull
+  public Single<UpdateAvatarResponse> setAvatar(String username, String avatar) {
+    final String urlTemplate = wikiMediaTestToolforgeUrl
+        + UPDATE_AVATAR_END_POINT;
+    return Single.fromCallable(() -> {
+      String url = String.format(Locale.ENGLISH,
+          urlTemplate,
+          username,
+          avatar);
+      HttpUrl.Builder urlBuilder = HttpUrl.parse(url).newBuilder();
+      urlBuilder.addQueryParameter("user", username);
+      urlBuilder.addQueryParameter("avatar", avatar);
+      Timber.i("Url %s", urlBuilder.toString());
+      Request request = new Request.Builder()
+          .url(urlBuilder.toString())
+          .build();
+      Response response = okHttpClient.newCall(request).execute();
+      if (response != null && response.body() != null && response.isSuccessful()) {
+        String json = response.body().string();
+        if (json == null) {
+          return null;
+        }
+        try {
+          return gson.fromJson(json, UpdateAvatarResponse.class);
+        } catch (Exception e) {
+          return new UpdateAvatarResponse();
+        }
+      }
+      return null;
+    });
+  }
+
   @NonNull
   public Single<Integer> getUploadCount(String userName) {
     HttpUrl.Builder urlBuilder = wikiMediaToolforgeUrl.newBuilder();
@@ -145,7 +239,6 @@ public Single<FeedbackResponse> getAchievements(String userName) {
           userName);
       HttpUrl.Builder urlBuilder = HttpUrl.parse(url).newBuilder();
       urlBuilder.addQueryParameter("user", userName);
-      Timber.i("Url %s", urlBuilder.toString());
       Request request = new Request.Builder()
           .url(urlBuilder.toString())
           .build();