mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 04:43:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Switch to using the commons toolforge instance fully

Browse source 
So far we used both the urbanecmbot instances and also the commons-android-app
toolforge instance for the functioning of the app.

The reality is that the commons-android-app instance itself had the ability
to return all the data necessary for the app. Use the same to get all the
data necessary for the app.

Fixes #5462
This commit is contained in:
Kaartic Sivaraam 2024-01-28 14:27:13 +05:30
parent 9e970123fd
commit 611f40801e
2 changed files with 3 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -48,9 +48,7 @@ import timber.log.Timber;
@SuppressWarnings({"WeakerAccess", "unused"}) @SuppressWarnings({"WeakerAccess", "unused"})
public class NetworkingModule { public class NetworkingModule {
private static final String WIKIDATA_SPARQL_QUERY_URL = "https://query.wikidata.org/sparql"; private static final String WIKIDATA_SPARQL_QUERY_URL = "https://query.wikidata.org/sparql";
private static final String TOOLS_FORGE_URL = "https://tools.wmflabs.org/urbanecmbot/commonsmisc"; private static final String TOOLS_FORGE_URL = "https://tools.wmflabs.org/commons-android-app/tool-commons-android-app";
private static final String TEST_TOOLS_FORGE_URL = "https://tools.wmflabs.org/commons-android-app/tool-commons-android-app";
public static final long OK_HTTP_CACHE_SIZE = 10 * 1024 * 1024; public static final long OK_HTTP_CACHE_SIZE = 10 * 1024 * 1024;
@ -91,13 +89,11 @@ public class NetworkingModule {
public OkHttpJsonApiClient provideOkHttpJsonApiClient(OkHttpClient okHttpClient, public OkHttpJsonApiClient provideOkHttpJsonApiClient(OkHttpClient okHttpClient,
DepictsClient depictsClient, DepictsClient depictsClient,
@Named("tools_forge") HttpUrl toolsForgeUrl, @Named("tools_forge") HttpUrl toolsForgeUrl,
@Named("test_tools_forge") HttpUrl testToolsForgeUrl,
@Named("default_preferences") JsonKvStore defaultKvStore, @Named("default_preferences") JsonKvStore defaultKvStore,
Gson gson) { Gson gson) {
return new OkHttpJsonApiClient(okHttpClient, return new OkHttpJsonApiClient(okHttpClient,
depictsClient, depictsClient,
toolsForgeUrl, toolsForgeUrl,
testToolsForgeUrl,
WIKIDATA_SPARQL_QUERY_URL, WIKIDATA_SPARQL_QUERY_URL,
BuildConfig.WIKIMEDIA_CAMPAIGNS_URL, BuildConfig.WIKIMEDIA_CAMPAIGNS_URL,
gson); gson);
@ -133,14 +129,6 @@ public class NetworkingModule {
return HttpUrl.parse(TOOLS_FORGE_URL); 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 @Provides
@Singleton @Singleton
@Named(NAMED_COMMONS_WIKI_SITE) @Named(NAMED_COMMONS_WIKI_SITE)

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

@ -47,7 +47,6 @@ public class OkHttpJsonApiClient {
private final OkHttpClient okHttpClient; private final OkHttpClient okHttpClient;
private final DepictsClient depictsClient; private final DepictsClient depictsClient;
private final HttpUrl wikiMediaToolforgeUrl; private final HttpUrl wikiMediaToolforgeUrl;
private final HttpUrl wikiMediaTestToolforgeUrl;
private final String sparqlQueryUrl; private final String sparqlQueryUrl;
private final String campaignsUrl; private final String campaignsUrl;
private final Gson gson; private final Gson gson;
@ -57,14 +56,12 @@ public class OkHttpJsonApiClient {
public OkHttpJsonApiClient(OkHttpClient okHttpClient, public OkHttpJsonApiClient(OkHttpClient okHttpClient,
DepictsClient depictsClient, DepictsClient depictsClient,
HttpUrl wikiMediaToolforgeUrl, HttpUrl wikiMediaToolforgeUrl,
HttpUrl wikiMediaTestToolforgeUrl,
String sparqlQueryUrl, String sparqlQueryUrl,
String campaignsUrl, String campaignsUrl,
Gson gson) { Gson gson) {
this.okHttpClient = okHttpClient; this.okHttpClient = okHttpClient;
this.depictsClient = depictsClient; this.depictsClient = depictsClient;
this.wikiMediaToolforgeUrl = wikiMediaToolforgeUrl; this.wikiMediaToolforgeUrl = wikiMediaToolforgeUrl;
this.wikiMediaTestToolforgeUrl = wikiMediaTestToolforgeUrl;
this.sparqlQueryUrl = sparqlQueryUrl; this.sparqlQueryUrl = sparqlQueryUrl;
this.campaignsUrl = campaignsUrl; this.campaignsUrl = campaignsUrl;
this.gson = gson; this.gson = gson;
@ -83,7 +80,7 @@ public class OkHttpJsonApiClient {
@NonNull @NonNull
public Observable<LeaderboardResponse> getLeaderboard(String userName, String duration, public Observable<LeaderboardResponse> getLeaderboard(String userName, String duration,
String category, String limit, String offset) { String category, String limit, String offset) {
final String fetchLeaderboardUrlTemplate = wikiMediaTestToolforgeUrl final String fetchLeaderboardUrlTemplate = wikiMediaToolforgeUrl
+ LEADERBOARD_END_POINT; + LEADERBOARD_END_POINT;
String url = String.format(Locale.ENGLISH, String url = String.format(Locale.ENGLISH,
fetchLeaderboardUrlTemplate, fetchLeaderboardUrlTemplate,
@ -129,7 +126,7 @@ public class OkHttpJsonApiClient {
*/ */
@NonNull @NonNull
public Single<UpdateAvatarResponse> setAvatar(String username, String avatar) { public Single<UpdateAvatarResponse> setAvatar(String username, String avatar) {
final String urlTemplate = wikiMediaTestToolforgeUrl final String urlTemplate = wikiMediaToolforgeUrl
+ UPDATE_AVATAR_END_POINT; + UPDATE_AVATAR_END_POINT;
return Single.fromCallable(() -> { return Single.fromCallable(() -> {
String url = String.format(Locale.ENGLISH, String url = String.format(Locale.ENGLISH,