[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Remove dependency on apps-android-java-mwapi library
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/361294 )
Change subject: Remove dependency on apps-android-java-mwapi library
..
Remove dependency on apps-android-java-mwapi library
Bug: T141127
Change-Id: Id8dde4eb22aa408e643a9b622dba654ffc5319f1
---
M app/build.gradle
M app/src/main/java/org/wikipedia/WikipediaApp.java
M app/src/main/java/org/wikipedia/captcha/CaptchaHandler.java
M
app/src/main/java/org/wikipedia/dataclient/okhttp/CommonHeaderRequestInterceptor.java
M app/src/main/java/org/wikipedia/dataclient/okhttp/OkHttpConnectionFactory.java
M app/src/main/java/org/wikipedia/page/PageFragmentLoadState.java
M app/src/main/java/org/wikipedia/util/ThrowableUtil.java
M app/src/main/java/org/wikipedia/views/WikiErrorView.java
D app/src/test/java/org/wikipedia/test/TestApi.java
M settings.gradle
10 files changed, 11 insertions(+), 154 deletions(-)
Approvals:
jenkins-bot: Verified
Mholloway: Looks good to me, approved
diff --git a/app/build.gradle b/app/build.gradle
index 988d08a..7f92afc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -156,7 +156,6 @@
}
dependencies {
-compileSubprojectOrModule ':java-mwapi:json',
'org.mediawiki.api:json:1.3.5', 'org.json', 'json'
// To keep the Maven Central dependencies up-to-date
// use http://gradleplease.appspot.com/ or http://search.maven.org/.
diff --git a/app/src/main/java/org/wikipedia/WikipediaApp.java
b/app/src/main/java/org/wikipedia/WikipediaApp.java
index 29f20e9..320a9d8 100644
--- a/app/src/main/java/org/wikipedia/WikipediaApp.java
+++ b/app/src/main/java/org/wikipedia/WikipediaApp.java
@@ -19,7 +19,6 @@
import com.squareup.leakcanary.RefWatcher;
import com.squareup.otto.Bus;
-import org.mediawiki.api.json.Api;
import org.wikipedia.analytics.FunnelManager;
import org.wikipedia.analytics.SessionFunnel;
import org.wikipedia.auth.AccountUtil;
@@ -86,7 +85,6 @@
private final RemoteConfig remoteConfig = new RemoteConfig();
private final Map databaseClients =
Collections.synchronizedMap(new HashMap());
-private final Map apis = new HashMap<>();
private AppLanguageState appLanguageState;
private FunnelManager funnelManager;
private SessionFunnel sessionFunnel;
@@ -160,8 +158,6 @@
enableWebViewDebugging();
-Api.setConnectionFactory(new OkHttpConnectionFactory());
-
ImagePipelineConfig config = ImagePipelineConfig.newBuilder(this)
.setNetworkFetcher(new
CacheableOkHttpNetworkFetcher(OkHttpConnectionFactory.getClient()))
.build();
@@ -209,23 +205,6 @@
: defaultString(wiki.languageCode());
return AcceptLanguageUtil.getAcceptLanguage(wikiLang,
defaultString(getAppLanguageCode()),
appLanguageState.getSystemLanguageCode());
-}
-
-public Api getAPIForSite(WikiSite wiki) {
-String host = wiki.host();
-String acceptLanguage = getAcceptLanguage(wiki);
-Map customHeaders =
buildCustomHeadersMap(acceptLanguage);
-Api api;
-
-String cachedApiKey = host + "-" + acceptLanguage;
-if (apis.containsKey(cachedApiKey)) {
-api = apis.get(cachedApiKey);
-} else {
-api = new Api(host, wiki.port(), wiki.secureScheme(),
-wiki.path("api.php"), customHeaders);
-apis.put(cachedApiKey, api);
-}
-return api;
}
/**
@@ -501,25 +480,6 @@
public void listenForNotifications() {
notificationReceiver.startPollTask(this);
-}
-
-// For java-mwapi API requests.
-// If adding a new header here (before this method is removed), make sure
to duplicate it
-// in the Retrofit header list
(OkHttpConnectionFactory#CommonHeaderInterceptor).
-@Deprecated
-private Map buildCustomHeadersMap(String acceptLanguage) {
-Map headers = new HashMap<>();
-headers.put("User-Agent", getUserAgent());
-
-if (isEventLoggingEnabled()) {
-headers.put("X-WMF-UUID", getAppInstallID());
-} else {
-// Send do-not-track header if the user has opted out of event
logging
-headers.put("DNT", "1");
-}
-
-headers.put("Accept-Language", acceptLanguage);
-return headers;
}
private void initAppLang() {
diff --git a/app/src/main/java/org/wikipedia/captcha/CaptchaHandler.java
b/app/src/main/java/org/wikipedia/captcha/CaptchaHandler.java
index 03fcb26..5587857 100644
--- a/app/src/main/java/org/wikipedia/captcha/CaptchaHandler.java
+++ b/app/src/main/java/org/wikipedia/captcha/CaptchaHandler.java
@@ -18,7 +18,6 @@
import com.facebook.drawee.view.SimpleDraweeView;
import com.facebook.imagepipeline.image.ImageInfo;
-import
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Remove dependency on apps-android-java-mwapi library
Yashasvi has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/361294 )
Change subject: Remove dependency on apps-android-java-mwapi library
..
Remove dependency on apps-android-java-mwapi library
Bug: T141127
Change-Id: Id8dde4eb22aa408e643a9b622dba654ffc5319f1
---
M app/build.gradle
M app/src/main/java/org/wikipedia/WikipediaApp.java
M app/src/main/java/org/wikipedia/captcha/CaptchaHandler.java
M
app/src/main/java/org/wikipedia/dataclient/okhttp/CommonHeaderRequestInterceptor.java
M app/src/main/java/org/wikipedia/dataclient/okhttp/OkHttpConnectionFactory.java
M app/src/main/java/org/wikipedia/page/PageFragmentLoadState.java
M app/src/main/java/org/wikipedia/util/ThrowableUtil.java
M app/src/main/java/org/wikipedia/views/WikiErrorView.java
D app/src/test/java/org/wikipedia/test/TestApi.java
M settings.gradle
10 files changed, 8 insertions(+), 163 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/94/361294/1
diff --git a/app/build.gradle b/app/build.gradle
index 988d08a..7f92afc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -156,7 +156,6 @@
}
dependencies {
-compileSubprojectOrModule ':java-mwapi:json',
'org.mediawiki.api:json:1.3.5', 'org.json', 'json'
// To keep the Maven Central dependencies up-to-date
// use http://gradleplease.appspot.com/ or http://search.maven.org/.
diff --git a/app/src/main/java/org/wikipedia/WikipediaApp.java
b/app/src/main/java/org/wikipedia/WikipediaApp.java
index 886d362..a108781 100644
--- a/app/src/main/java/org/wikipedia/WikipediaApp.java
+++ b/app/src/main/java/org/wikipedia/WikipediaApp.java
@@ -19,7 +19,6 @@
import com.squareup.leakcanary.RefWatcher;
import com.squareup.otto.Bus;
-import org.mediawiki.api.json.Api;
import org.wikipedia.analytics.FunnelManager;
import org.wikipedia.analytics.SessionFunnel;
import org.wikipedia.auth.AccountUtil;
@@ -87,7 +86,6 @@
private final RemoteConfig remoteConfig = new RemoteConfig();
private final Map databaseClients =
Collections.synchronizedMap(new HashMap());
-private final Map apis = new HashMap<>();
private AppLanguageState appLanguageState;
private FunnelManager funnelManager;
private SessionFunnel sessionFunnel;
@@ -161,8 +159,6 @@
enableWebViewDebugging();
-Api.setConnectionFactory(new OkHttpConnectionFactory());
-
ImagePipelineConfig config = ImagePipelineConfig.newBuilder(this)
.setNetworkFetcher(new
CacheableOkHttpNetworkFetcher(OkHttpConnectionFactory.getClient()))
.build();
@@ -212,23 +208,6 @@
appLanguageState.getSystemLanguageCode());
}
-public Api getAPIForSite(WikiSite wiki) {
-String host = wiki.host();
-String acceptLanguage = getAcceptLanguage(wiki);
-Map customHeaders =
buildCustomHeadersMap(acceptLanguage);
-Api api;
-
-String cachedApiKey = host + "-" + acceptLanguage;
-if (apis.containsKey(cachedApiKey)) {
-api = apis.get(cachedApiKey);
-} else {
-api = new Api(host, wiki.port(), wiki.secureScheme(),
-wiki.path("api.php"), customHeaders);
-apis.put(cachedApiKey, api);
-}
-return api;
-}
-
/**
* Default wiki for the app
* You should use PageTitle.getWikiSite() to get the article wiki
@@ -240,15 +219,6 @@
wiki = WikiSite.forLanguageCode(lang);
}
return wiki;
-}
-
-/**
- * Convenience method to get an API object for the app wiki.
- *
- * @return An API object that is equivalent to calling
getAPIForSite(WikiSite)
- */
-public Api getSiteApi() {
-return getAPIForSite(getWikiSite());
}
@Nullable
@@ -514,25 +484,6 @@
public void listenForNotifications() {
notificationReceiver.startPollTask(this);
-}
-
-// For java-mwapi API requests.
-// If adding a new header here (before this method is removed), make sure
to duplicate it
-// in the Retrofit header list
(OkHttpConnectionFactory#CommonHeaderInterceptor).
-@Deprecated
-private Map buildCustomHeadersMap(String acceptLanguage) {
-Map headers = new HashMap<>();
-headers.put("User-Agent", getUserAgent());
-
-if (isEventLoggingEnabled()) {
-headers.put("X-WMF-UUID", getAppInstallID());
-} else {
-// Send do-not-track header if the user has opted out of event
logging
-headers.put("DNT", "1");
-}
-
-headers.put("Accept-Language", acceptLanguage);
-return headers;
}
private void initAppLang() {
diff --git a/app/src/main/java/org/wikipedia/captcha/CaptchaHandler.java
