From dcf8d0fa8570a7d5adac26810a1e98f5b9ac3e9f Mon Sep 17 00:00:00 2001 From: Adam Jones Date: Thu, 28 Mar 2019 22:22:54 +0000 Subject: [PATCH 1/2] Fix #2793: Campaigns work on Beta --- app/build.gradle | 2 ++ .../main/java/fr/free/nrw/commons/di/NetworkingModule.java | 6 ++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 8cbb6eb2fa..085ef923c0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -186,6 +186,7 @@ android { buildConfigField "String", "WIKIMEDIA_API_HOST", "\"https://commons.wikimedia.org/w/api.php\"" buildConfigField "String", "WIKIDATA_API_HOST", "\"https://www.wikidata.org/w/api.php\"" buildConfigField "String", "WIKIMEDIA_FORGE_API_HOST", "\"https://tools.wmflabs.org/\"" + buildConfigField "String", "WIKIMEDIA_CAMPAIGNS_URL", "\"https://raw.githubusercontent.com/commons-app/campaigns/master/prod/campaigns.json\"" buildConfigField "String", "IMAGE_URL_BASE", "\"https://upload.wikimedia.org/wikipedia/commons\"" buildConfigField "String", "HOME_URL", "\"https://commons.wikimedia.org/wiki/\"" buildConfigField "String", "COMMONS_URL", "\"https://commons.wikimedia.org\"" @@ -218,6 +219,7 @@ android { buildConfigField "String", "WIKIMEDIA_API_HOST", "\"https://commons.wikimedia.beta.wmflabs.org/w/api.php\"" buildConfigField "String", "WIKIDATA_API_HOST", "\"https://www.wikidata.org/w/api.php\"" buildConfigField "String", "WIKIMEDIA_FORGE_API_HOST", "\"https://tools.wmflabs.org/\"" + buildConfigField "String", "WIKIMEDIA_CAMPAIGNS_URL", "\"https://raw.githubusercontent.com/commons-app/campaigns/master/beta/campaigns.json\"" buildConfigField "String", "IMAGE_URL_BASE", "\"https://upload.beta.wmflabs.org/wikipedia/commons\"" buildConfigField "String", "HOME_URL", "\"https://commons.wikimedia.beta.wmflabs.org/wiki/\"" buildConfigField "String", "COMMONS_URL", "\"https://commons.wikimedia.beta.wmflabs.org\"" 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 77b420737f..26b2ec3efc 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 @@ -2,7 +2,6 @@ import android.content.Context; import android.net.Uri; -import androidx.annotation.NonNull; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -13,6 +12,7 @@ import javax.inject.Named; import javax.inject.Singleton; +import androidx.annotation.NonNull; import dagger.Module; import dagger.Provides; import fr.free.nrw.commons.BuildConfig; @@ -32,8 +32,6 @@ @SuppressWarnings({"WeakerAccess", "unused"}) public class NetworkingModule { private static final String WIKIDATA_SPARQL_QUERY_URL = "https://query.wikidata.org/sparql"; - private final String WIKIMEDIA_CAMPAIGNS_BASE_URL = - "https://raw.githubusercontent.com/commons-app/campaigns/master/campaigns.json"; private static final String TOOLS_FORGE_URL = "https://tools.wmflabs.org/urbanecmbot/commonsmisc"; private static final String TEST_TOOLS_FORGE_URL = "https://tools.wmflabs.org/commons-android-app/tool-commons-android-app"; @@ -80,7 +78,7 @@ public OkHttpJsonApiClient provideOkHttpJsonApiClient(OkHttpClient okHttpClient, return new OkHttpJsonApiClient(okHttpClient, toolsForgeUrl, WIKIDATA_SPARQL_QUERY_URL, - WIKIMEDIA_CAMPAIGNS_BASE_URL, + BuildConfig.WIKIMEDIA_CAMPAIGNS_URL, BuildConfig.WIKIMEDIA_API_HOST, defaultKvStore, gson); From ff4718df9f3e47032ed24f6a6dc3a8dfc8d2bf6a Mon Sep 17 00:00:00 2001 From: Adam Jones Date: Fri, 29 Mar 2019 18:48:11 +0000 Subject: [PATCH 2/2] Update campaign endpoint urls --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 085ef923c0..96b5dac151 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -186,7 +186,7 @@ android { buildConfigField "String", "WIKIMEDIA_API_HOST", "\"https://commons.wikimedia.org/w/api.php\"" buildConfigField "String", "WIKIDATA_API_HOST", "\"https://www.wikidata.org/w/api.php\"" buildConfigField "String", "WIKIMEDIA_FORGE_API_HOST", "\"https://tools.wmflabs.org/\"" - buildConfigField "String", "WIKIMEDIA_CAMPAIGNS_URL", "\"https://raw.githubusercontent.com/commons-app/campaigns/master/prod/campaigns.json\"" + buildConfigField "String", "WIKIMEDIA_CAMPAIGNS_URL", "\"https://raw.githubusercontent.com/commons-app/campaigns/master/campaigns.json\"" buildConfigField "String", "IMAGE_URL_BASE", "\"https://upload.wikimedia.org/wikipedia/commons\"" buildConfigField "String", "HOME_URL", "\"https://commons.wikimedia.org/wiki/\"" buildConfigField "String", "COMMONS_URL", "\"https://commons.wikimedia.org\"" @@ -219,7 +219,7 @@ android { buildConfigField "String", "WIKIMEDIA_API_HOST", "\"https://commons.wikimedia.beta.wmflabs.org/w/api.php\"" buildConfigField "String", "WIKIDATA_API_HOST", "\"https://www.wikidata.org/w/api.php\"" buildConfigField "String", "WIKIMEDIA_FORGE_API_HOST", "\"https://tools.wmflabs.org/\"" - buildConfigField "String", "WIKIMEDIA_CAMPAIGNS_URL", "\"https://raw.githubusercontent.com/commons-app/campaigns/master/beta/campaigns.json\"" + buildConfigField "String", "WIKIMEDIA_CAMPAIGNS_URL", "\"https://raw.githubusercontent.com/commons-app/campaigns/master/campaigns_beta_active.json\"" buildConfigField "String", "IMAGE_URL_BASE", "\"https://upload.beta.wmflabs.org/wikipedia/commons\"" buildConfigField "String", "HOME_URL", "\"https://commons.wikimedia.beta.wmflabs.org/wiki/\"" buildConfigField "String", "COMMONS_URL", "\"https://commons.wikimedia.beta.wmflabs.org\""