Niedzielski has uploaded a new change for review.
https://gerrit.wikimedia.org/r/316378
Change subject: Hygiene: update ApiTask and OkHttp* packaging
......................................................................
Hygiene: update ApiTask and OkHttp* packaging
Move ApiTask and OkHttpConnectionFactory to org.wikipedia.dataclient.
This might not be the ideal location but seems more appropriate than
org.wikipedia.
Change-Id: Ida2a670cafa0cd3a153b3fb5c8966982df3d96e8
---
M app/src/main/java/org/wikipedia/RemoteConfigRefreshTask.java
M app/src/main/java/org/wikipedia/WikipediaApp.java
M app/src/main/java/org/wikipedia/alphaupdater/AlphaUpdateChecker.java
M app/src/main/java/org/wikipedia/analytics/EventLoggingEvent.java
M app/src/main/java/org/wikipedia/createaccount/CreateAccountInfoTask.java
M app/src/main/java/org/wikipedia/createaccount/CreateAccountTask.java
R app/src/main/java/org/wikipedia/dataclient/ApiTask.java
R app/src/main/java/org/wikipedia/dataclient/OkHttpConnectionFactory.java
M app/src/main/java/org/wikipedia/dataclient/retrofit/RetrofitFactory.java
M app/src/main/java/org/wikipedia/editing/EditPreviewTask.java
M app/src/main/java/org/wikipedia/editing/EditTask.java
M app/src/main/java/org/wikipedia/editing/FetchEditTokenTask.java
M app/src/main/java/org/wikipedia/editing/FetchSectionWikitextTask.java
M app/src/main/java/org/wikipedia/editing/RefreshCaptchaTask.java
M app/src/main/java/org/wikipedia/language/LangLinksFetchTask.java
M app/src/main/java/org/wikipedia/nearby/NearbyFetchTask.java
M app/src/main/java/org/wikipedia/page/PageQueryTask.java
M app/src/main/java/org/wikipedia/savedpages/SavedPageSyncService.java
M app/src/main/java/org/wikipedia/search/FullSearchArticlesTask.java
M app/src/main/java/org/wikipedia/search/TitleSearchTask.java
M app/src/main/java/org/wikipedia/zero/WikipediaZeroTask.java
21 files changed, 24 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/78/316378/1
diff --git a/app/src/main/java/org/wikipedia/RemoteConfigRefreshTask.java
b/app/src/main/java/org/wikipedia/RemoteConfigRefreshTask.java
index eb64827..0553bcc 100644
--- a/app/src/main/java/org/wikipedia/RemoteConfigRefreshTask.java
+++ b/app/src/main/java/org/wikipedia/RemoteConfigRefreshTask.java
@@ -2,6 +2,7 @@
import org.json.JSONObject;
import org.wikipedia.concurrency.SaneAsyncTask;
+import org.wikipedia.dataclient.OkHttpConnectionFactory;
import org.wikipedia.recurring.RecurringTask;
import org.wikipedia.settings.RbSwitch;
import org.wikipedia.util.log.L;
diff --git a/app/src/main/java/org/wikipedia/WikipediaApp.java
b/app/src/main/java/org/wikipedia/WikipediaApp.java
index 677c19e..d6c5fdb 100644
--- a/app/src/main/java/org/wikipedia/WikipediaApp.java
+++ b/app/src/main/java/org/wikipedia/WikipediaApp.java
@@ -29,6 +29,7 @@
import org.wikipedia.database.DatabaseClient;
import org.wikipedia.database.contract.AppContentProviderContract;
import org.wikipedia.database.contract.ReadingListPageContract;
+import org.wikipedia.dataclient.OkHttpConnectionFactory;
import org.wikipedia.editing.EditTokenStorage;
import org.wikipedia.editing.summaries.EditSummary;
import org.wikipedia.events.ChangeTextSizeEvent;
diff --git
a/app/src/main/java/org/wikipedia/alphaupdater/AlphaUpdateChecker.java
b/app/src/main/java/org/wikipedia/alphaupdater/AlphaUpdateChecker.java
index 3eefd1d..c9954b1 100644
--- a/app/src/main/java/org/wikipedia/alphaupdater/AlphaUpdateChecker.java
+++ b/app/src/main/java/org/wikipedia/alphaupdater/AlphaUpdateChecker.java
@@ -1,6 +1,6 @@
package org.wikipedia.alphaupdater;
-import org.wikipedia.OkHttpConnectionFactory;
+import org.wikipedia.dataclient.OkHttpConnectionFactory;
import org.wikipedia.R;
import org.wikipedia.recurring.RecurringTask;
import org.json.JSONException;
diff --git a/app/src/main/java/org/wikipedia/analytics/EventLoggingEvent.java
b/app/src/main/java/org/wikipedia/analytics/EventLoggingEvent.java
index fdadd1b..d96c8b0 100644
--- a/app/src/main/java/org/wikipedia/analytics/EventLoggingEvent.java
+++ b/app/src/main/java/org/wikipedia/analytics/EventLoggingEvent.java
@@ -3,7 +3,7 @@
import android.net.Uri;
import org.json.JSONException;
import org.json.JSONObject;
-import org.wikipedia.OkHttpConnectionFactory;
+import org.wikipedia.dataclient.OkHttpConnectionFactory;
import org.wikipedia.WikipediaApp;
import org.wikipedia.concurrency.SaneAsyncTask;
import org.wikipedia.util.log.L;
diff --git
a/app/src/main/java/org/wikipedia/createaccount/CreateAccountInfoTask.java
b/app/src/main/java/org/wikipedia/createaccount/CreateAccountInfoTask.java
index 293502b..6860049 100644
--- a/app/src/main/java/org/wikipedia/createaccount/CreateAccountInfoTask.java
+++ b/app/src/main/java/org/wikipedia/createaccount/CreateAccountInfoTask.java
@@ -9,7 +9,7 @@
import org.mediawiki.api.json.ApiException;
import org.mediawiki.api.json.ApiResult;
import org.mediawiki.api.json.RequestBuilder;
-import org.wikipedia.ApiTask;
+import org.wikipedia.dataclient.ApiTask;
import org.wikipedia.WikipediaApp;
import org.wikipedia.util.log.L;
diff --git
a/app/src/main/java/org/wikipedia/createaccount/CreateAccountTask.java
b/app/src/main/java/org/wikipedia/createaccount/CreateAccountTask.java
index 122b636..40ab1b8 100644
--- a/app/src/main/java/org/wikipedia/createaccount/CreateAccountTask.java
+++ b/app/src/main/java/org/wikipedia/createaccount/CreateAccountTask.java
@@ -9,7 +9,7 @@
import org.mediawiki.api.json.ApiException;
import org.mediawiki.api.json.ApiResult;
import org.mediawiki.api.json.RequestBuilder;
-import org.wikipedia.ApiTask;
+import org.wikipedia.dataclient.ApiTask;
import org.wikipedia.Constants;
import org.wikipedia.WikipediaApp;
diff --git a/app/src/main/java/org/wikipedia/ApiTask.java
b/app/src/main/java/org/wikipedia/dataclient/ApiTask.java
similarity index 96%
rename from app/src/main/java/org/wikipedia/ApiTask.java
rename to app/src/main/java/org/wikipedia/dataclient/ApiTask.java
index c04d08d..3d8db3f 100644
--- a/app/src/main/java/org/wikipedia/ApiTask.java
+++ b/app/src/main/java/org/wikipedia/dataclient/ApiTask.java
@@ -1,4 +1,4 @@
-package org.wikipedia;
+package org.wikipedia.dataclient;
import android.net.Uri;
import android.support.annotation.VisibleForTesting;
@@ -7,6 +7,7 @@
import org.mediawiki.api.json.ApiException;
import org.mediawiki.api.json.ApiResult;
import org.mediawiki.api.json.RequestBuilder;
+import org.wikipedia.WikipediaApp;
import org.wikipedia.concurrency.SaneAsyncTask;
import org.wikipedia.util.log.L;
diff --git a/app/src/main/java/org/wikipedia/OkHttpConnectionFactory.java
b/app/src/main/java/org/wikipedia/dataclient/OkHttpConnectionFactory.java
similarity index 95%
rename from app/src/main/java/org/wikipedia/OkHttpConnectionFactory.java
rename to
app/src/main/java/org/wikipedia/dataclient/OkHttpConnectionFactory.java
index a6f0521..fbe90b0 100644
--- a/app/src/main/java/org/wikipedia/OkHttpConnectionFactory.java
+++ b/app/src/main/java/org/wikipedia/dataclient/OkHttpConnectionFactory.java
@@ -1,9 +1,11 @@
-package org.wikipedia;
+package org.wikipedia.dataclient;
import android.support.annotation.NonNull;
import com.github.kevinsawicki.http.HttpRequest;
+import org.wikipedia.SharedPreferenceCookieManager;
+import org.wikipedia.WikipediaApp;
import org.wikipedia.settings.Prefs;
import java.io.IOException;
diff --git
a/app/src/main/java/org/wikipedia/dataclient/retrofit/RetrofitFactory.java
b/app/src/main/java/org/wikipedia/dataclient/retrofit/RetrofitFactory.java
index 5a5d98c..74d3d3d 100644
--- a/app/src/main/java/org/wikipedia/dataclient/retrofit/RetrofitFactory.java
+++ b/app/src/main/java/org/wikipedia/dataclient/retrofit/RetrofitFactory.java
@@ -2,7 +2,7 @@
import android.support.annotation.NonNull;
-import org.wikipedia.OkHttpConnectionFactory;
+import org.wikipedia.dataclient.OkHttpConnectionFactory;
import org.wikipedia.Site;
import org.wikipedia.WikipediaApp;
import org.wikipedia.json.GsonUtil;
diff --git a/app/src/main/java/org/wikipedia/editing/EditPreviewTask.java
b/app/src/main/java/org/wikipedia/editing/EditPreviewTask.java
index a3dd624..48117c8 100644
--- a/app/src/main/java/org/wikipedia/editing/EditPreviewTask.java
+++ b/app/src/main/java/org/wikipedia/editing/EditPreviewTask.java
@@ -5,7 +5,7 @@
import org.mediawiki.api.json.ApiException;
import org.mediawiki.api.json.ApiResult;
import org.mediawiki.api.json.RequestBuilder;
-import org.wikipedia.ApiTask;
+import org.wikipedia.dataclient.ApiTask;
import org.wikipedia.page.PageTitle;
import org.wikipedia.WikipediaApp;
diff --git a/app/src/main/java/org/wikipedia/editing/EditTask.java
b/app/src/main/java/org/wikipedia/editing/EditTask.java
index 85763ef..e5f0813 100644
--- a/app/src/main/java/org/wikipedia/editing/EditTask.java
+++ b/app/src/main/java/org/wikipedia/editing/EditTask.java
@@ -6,7 +6,7 @@
import org.mediawiki.api.json.ApiException;
import org.mediawiki.api.json.ApiResult;
import org.mediawiki.api.json.RequestBuilder;
-import org.wikipedia.ApiTask;
+import org.wikipedia.dataclient.ApiTask;
import org.wikipedia.page.PageTitle;
import org.wikipedia.WikipediaApp;
diff --git a/app/src/main/java/org/wikipedia/editing/FetchEditTokenTask.java
b/app/src/main/java/org/wikipedia/editing/FetchEditTokenTask.java
index 1218a75..38644bb 100644
--- a/app/src/main/java/org/wikipedia/editing/FetchEditTokenTask.java
+++ b/app/src/main/java/org/wikipedia/editing/FetchEditTokenTask.java
@@ -4,7 +4,7 @@
import org.mediawiki.api.json.Api;
import org.mediawiki.api.json.ApiResult;
import org.mediawiki.api.json.RequestBuilder;
-import org.wikipedia.ApiTask;
+import org.wikipedia.dataclient.ApiTask;
import org.wikipedia.Site;
import org.wikipedia.WikipediaApp;
diff --git
a/app/src/main/java/org/wikipedia/editing/FetchSectionWikitextTask.java
b/app/src/main/java/org/wikipedia/editing/FetchSectionWikitextTask.java
index d7326c0..8c45bd7 100644
--- a/app/src/main/java/org/wikipedia/editing/FetchSectionWikitextTask.java
+++ b/app/src/main/java/org/wikipedia/editing/FetchSectionWikitextTask.java
@@ -5,7 +5,7 @@
import org.mediawiki.api.json.Api;
import org.mediawiki.api.json.ApiResult;
import org.mediawiki.api.json.RequestBuilder;
-import org.wikipedia.ApiTask;
+import org.wikipedia.dataclient.ApiTask;
import org.wikipedia.page.PageTitle;
import org.wikipedia.WikipediaApp;
diff --git a/app/src/main/java/org/wikipedia/editing/RefreshCaptchaTask.java
b/app/src/main/java/org/wikipedia/editing/RefreshCaptchaTask.java
index ba7a964..88a4b92 100644
--- a/app/src/main/java/org/wikipedia/editing/RefreshCaptchaTask.java
+++ b/app/src/main/java/org/wikipedia/editing/RefreshCaptchaTask.java
@@ -4,7 +4,7 @@
import org.mediawiki.api.json.Api;
import org.mediawiki.api.json.ApiResult;
import org.mediawiki.api.json.RequestBuilder;
-import org.wikipedia.ApiTask;
+import org.wikipedia.dataclient.ApiTask;
import org.wikipedia.Site;
import org.wikipedia.WikipediaApp;
diff --git a/app/src/main/java/org/wikipedia/language/LangLinksFetchTask.java
b/app/src/main/java/org/wikipedia/language/LangLinksFetchTask.java
index 45fc0a8..dd27283 100644
--- a/app/src/main/java/org/wikipedia/language/LangLinksFetchTask.java
+++ b/app/src/main/java/org/wikipedia/language/LangLinksFetchTask.java
@@ -6,7 +6,7 @@
import org.mediawiki.api.json.Api;
import org.mediawiki.api.json.ApiResult;
import org.mediawiki.api.json.RequestBuilder;
-import org.wikipedia.ApiTask;
+import org.wikipedia.dataclient.ApiTask;
import org.wikipedia.page.PageTitle;
import org.wikipedia.Site;
import org.wikipedia.WikipediaApp;
diff --git a/app/src/main/java/org/wikipedia/nearby/NearbyFetchTask.java
b/app/src/main/java/org/wikipedia/nearby/NearbyFetchTask.java
index fcc30e7..5a7437b 100644
--- a/app/src/main/java/org/wikipedia/nearby/NearbyFetchTask.java
+++ b/app/src/main/java/org/wikipedia/nearby/NearbyFetchTask.java
@@ -7,7 +7,7 @@
import org.mediawiki.api.json.ApiException;
import org.mediawiki.api.json.ApiResult;
import org.mediawiki.api.json.RequestBuilder;
-import org.wikipedia.ApiTask;
+import org.wikipedia.dataclient.ApiTask;
import org.wikipedia.Constants;
import org.wikipedia.Site;
import org.wikipedia.WikipediaApp;
diff --git a/app/src/main/java/org/wikipedia/page/PageQueryTask.java
b/app/src/main/java/org/wikipedia/page/PageQueryTask.java
index ba73937..2766b31 100644
--- a/app/src/main/java/org/wikipedia/page/PageQueryTask.java
+++ b/app/src/main/java/org/wikipedia/page/PageQueryTask.java
@@ -5,7 +5,7 @@
import org.mediawiki.api.json.Api;
import org.mediawiki.api.json.ApiResult;
import org.mediawiki.api.json.RequestBuilder;
-import org.wikipedia.ApiTask;
+import org.wikipedia.dataclient.ApiTask;
import org.wikipedia.Site;
import java.util.ArrayList;
diff --git
a/app/src/main/java/org/wikipedia/savedpages/SavedPageSyncService.java
b/app/src/main/java/org/wikipedia/savedpages/SavedPageSyncService.java
index f320ae5..0554f93 100644
--- a/app/src/main/java/org/wikipedia/savedpages/SavedPageSyncService.java
+++ b/app/src/main/java/org/wikipedia/savedpages/SavedPageSyncService.java
@@ -6,7 +6,7 @@
import android.support.annotation.Nullable;
import android.support.annotation.VisibleForTesting;
-import org.wikipedia.OkHttpConnectionFactory;
+import org.wikipedia.dataclient.OkHttpConnectionFactory;
import org.wikipedia.WikipediaApp;
import org.wikipedia.page.Page;
import org.wikipedia.page.PageTitle;
diff --git a/app/src/main/java/org/wikipedia/search/FullSearchArticlesTask.java
b/app/src/main/java/org/wikipedia/search/FullSearchArticlesTask.java
index b867026..c6497db 100644
--- a/app/src/main/java/org/wikipedia/search/FullSearchArticlesTask.java
+++ b/app/src/main/java/org/wikipedia/search/FullSearchArticlesTask.java
@@ -7,7 +7,7 @@
import org.mediawiki.api.json.ApiException;
import org.mediawiki.api.json.ApiResult;
import org.mediawiki.api.json.RequestBuilder;
-import org.wikipedia.ApiTask;
+import org.wikipedia.dataclient.ApiTask;
import org.wikipedia.Constants;
import org.wikipedia.Site;
import org.wikipedia.page.PageProperties;
diff --git a/app/src/main/java/org/wikipedia/search/TitleSearchTask.java
b/app/src/main/java/org/wikipedia/search/TitleSearchTask.java
index 3c57a49..ba6274b 100644
--- a/app/src/main/java/org/wikipedia/search/TitleSearchTask.java
+++ b/app/src/main/java/org/wikipedia/search/TitleSearchTask.java
@@ -1,7 +1,7 @@
package org.wikipedia.search;
import org.json.JSONArray;
-import org.wikipedia.ApiTask;
+import org.wikipedia.dataclient.ApiTask;
import org.wikipedia.Constants;
import org.wikipedia.page.PageTitle;
import org.wikipedia.Site;
diff --git a/app/src/main/java/org/wikipedia/zero/WikipediaZeroTask.java
b/app/src/main/java/org/wikipedia/zero/WikipediaZeroTask.java
index eab1a00..4095fe8 100644
--- a/app/src/main/java/org/wikipedia/zero/WikipediaZeroTask.java
+++ b/app/src/main/java/org/wikipedia/zero/WikipediaZeroTask.java
@@ -7,7 +7,7 @@
import org.mediawiki.api.json.Api;
import org.mediawiki.api.json.ApiResult;
import org.mediawiki.api.json.RequestBuilder;
-import org.wikipedia.ApiTask;
+import org.wikipedia.dataclient.ApiTask;
public class WikipediaZeroTask extends ApiTask<ZeroConfig> {
private String userAgent;
--
To view, visit https://gerrit.wikimedia.org/r/316378
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida2a670cafa0cd3a153b3fb5c8966982df3d96e8
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski <sniedziel...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
