From 4a671dcb3d0ddb0cbdaf39b0e7d37b81b8fc3bc8 Mon Sep 17 00:00:00 2001
From: Vivek Maskara <maskaravivek@gmail.com>
Date: Tue, 4 Jun 2019 20:04:05 +0530
Subject: [PATCH] Fetch achievements data from beta cluster for beta variant of
 the app (#2986)

---
 .../fr/free/nrw/commons/di/NetworkingModule.java  |  4 ++--
 .../nrw/commons/mwapi/OkHttpJsonApiClient.java    | 15 ++++++++++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/di/NetworkingModule.java b/app/src/main/java/fr/free/nrw/commons/di/NetworkingModule.java
index f66ae6527..23bf7e3fc 100644
--- a/app/src/main/java/fr/free/nrw/commons/di/NetworkingModule.java
+++ b/app/src/main/java/fr/free/nrw/commons/di/NetworkingModule.java
@@ -70,7 +70,7 @@ public class NetworkingModule {
     @Provides
     @Singleton
     public OkHttpJsonApiClient provideOkHttpJsonApiClient(OkHttpClient okHttpClient,
-                                                          @Named("tools_force") HttpUrl toolsForgeUrl,
+                                                          @Named("tools_forge") HttpUrl toolsForgeUrl,
                                                           @Named("default_preferences") JsonKvStore defaultKvStore,
                                                           Gson gson) {
         return new OkHttpJsonApiClient(okHttpClient,
@@ -91,7 +91,7 @@ public class NetworkingModule {
     }
 
     @Provides
-    @Named("tools_force")
+    @Named("tools_forge")
     @NonNull
     @SuppressWarnings("ConstantConditions")
     public HttpUrl provideToolsForgeUrl() {
diff --git a/app/src/main/java/fr/free/nrw/commons/mwapi/OkHttpJsonApiClient.java b/app/src/main/java/fr/free/nrw/commons/mwapi/OkHttpJsonApiClient.java
index bba273d3b..a2c9e81d8 100644
--- a/app/src/main/java/fr/free/nrw/commons/mwapi/OkHttpJsonApiClient.java
+++ b/app/src/main/java/fr/free/nrw/commons/mwapi/OkHttpJsonApiClient.java
@@ -3,6 +3,7 @@ package fr.free.nrw.commons.mwapi;
 import android.text.TextUtils;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 
@@ -11,6 +12,7 @@ import org.wikipedia.dataclient.mwapi.MwQueryPage;
 import org.wikipedia.dataclient.mwapi.MwQueryResponse;
 import org.wikipedia.dataclient.mwapi.RecentChange;
 import org.wikipedia.util.DateUtil;
+
 import java.io.IOException;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
@@ -34,6 +36,7 @@ import fr.free.nrw.commons.nearby.model.NearbyResponse;
 import fr.free.nrw.commons.nearby.model.NearbyResultItem;
 import fr.free.nrw.commons.upload.FileUtils;
 import fr.free.nrw.commons.utils.CommonsDateUtil;
+import fr.free.nrw.commons.utils.ConfigUtils;
 import fr.free.nrw.commons.wikidata.model.GetWikidataEditCountResponse;
 import io.reactivex.Observable;
 import io.reactivex.Single;
@@ -85,6 +88,11 @@ public class OkHttpJsonApiClient {
         urlBuilder
                 .addPathSegments("/uploadsbyuser.py")
                 .addQueryParameter("user", userName);
+
+        if (ConfigUtils.isBetaFlavour()) {
+            urlBuilder.addQueryParameter("labs", "commonswiki");
+        }
+
         Request request = new Request.Builder()
                 .url(urlBuilder.build())
                 .build();
@@ -106,6 +114,11 @@ public class OkHttpJsonApiClient {
         urlBuilder
                 .addPathSegments("/wikidataedits.py")
                 .addQueryParameter("user", userName);
+
+        if (ConfigUtils.isBetaFlavour()) {
+            urlBuilder.addQueryParameter("labs", "commonswiki");
+        }
+
         Request request = new Request.Builder()
                 .url(urlBuilder.build())
                 .build();
@@ -134,7 +147,7 @@ public class OkHttpJsonApiClient {
      */
     public Single<FeedbackResponse> getAchievements(String userName) {
         final String fetchAchievementUrlTemplate =
-                wikiMediaToolforgeUrl + "/feedback.py";
+                wikiMediaToolforgeUrl + (ConfigUtils.isBetaFlavour() ? "/feedback.py?labs=commonswiki" : "/feedback.py");
         return Single.fromCallable(() -> {
             String url = String.format(
                     Locale.ENGLISH,