Brion VIBBER has submitted this change and it was merged.
Change subject: Make magic numbers unmagical
......................................................................
Make magic numbers unmagical
Still some left. Need more careful handling.
Bug: 63742
Change-Id: I8f31ddcc4248f1f938fc1bd1c4c048ca5532de08
---
M wikipedia/src/main/java/org/wikipedia/ApiTask.java
M wikipedia/src/main/java/org/wikipedia/PageQueryTask.java
M wikipedia/src/main/java/org/wikipedia/concurrency/SaneAsyncTask.java
M wikipedia/src/main/java/org/wikipedia/createaccount/CreateAccountTask.java
M wikipedia/src/main/java/org/wikipedia/editing/DoEditTask.java
M wikipedia/src/main/java/org/wikipedia/editing/EditPreviewTask.java
M wikipedia/src/main/java/org/wikipedia/editing/FetchEditTokenTask.java
M wikipedia/src/main/java/org/wikipedia/editing/FetchSectionWikitextTask.java
M wikipedia/src/main/java/org/wikipedia/editing/RefreshCaptchaTask.java
M wikipedia/src/main/java/org/wikipedia/eventlogging/EventLoggingEvent.java
M wikipedia/src/main/java/org/wikipedia/interlanguage/LangLinksFetchTask.java
M wikipedia/src/main/java/org/wikipedia/login/LoginTask.java
M wikipedia/src/main/java/org/wikipedia/login/LogoutTask.java
M wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
M wikipedia/src/main/java/org/wikipedia/page/SectionsFetchTask.java
M
wikipedia/src/main/java/org/wikipedia/pagehistory/usercontributions/FetchUserContribsTask.java
M wikipedia/src/main/java/org/wikipedia/pageimages/PageImageSaveTask.java
M wikipedia/src/main/java/org/wikipedia/pageimages/PageImagesTask.java
M wikipedia/src/main/java/org/wikipedia/random/RandomArticleIdTask.java
M wikipedia/src/main/java/org/wikipedia/savedpages/DeleteSavedPageTask.java
M wikipedia/src/main/java/org/wikipedia/savedpages/DownloadImageTask.java
M wikipedia/src/main/java/org/wikipedia/savedpages/LoadSavedPageTask.java
M wikipedia/src/main/java/org/wikipedia/savedpages/SavePageTask.java
M wikipedia/src/main/java/org/wikipedia/search/SearchArticlesTask.java
M wikipedia/src/main/java/org/wikipedia/zero/WikipediaZeroTask.java
25 files changed, 32 insertions(+), 45 deletions(-)
Approvals:
Brion VIBBER: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wikipedia/src/main/java/org/wikipedia/ApiTask.java
b/wikipedia/src/main/java/org/wikipedia/ApiTask.java
index b178a30..9c28115 100644
--- a/wikipedia/src/main/java/org/wikipedia/ApiTask.java
+++ b/wikipedia/src/main/java/org/wikipedia/ApiTask.java
@@ -6,8 +6,8 @@
public abstract class ApiTask<T> extends SaneAsyncTask<T> {
private final Api api;
- public ApiTask(int threadCount, Api api) {
- super(threadCount);
+ public ApiTask(int concurrency, Api api) {
+ super(concurrency);
this.api = api;
}
diff --git a/wikipedia/src/main/java/org/wikipedia/PageQueryTask.java
b/wikipedia/src/main/java/org/wikipedia/PageQueryTask.java
index b455a14..0a42522 100644
--- a/wikipedia/src/main/java/org/wikipedia/PageQueryTask.java
+++ b/wikipedia/src/main/java/org/wikipedia/PageQueryTask.java
@@ -10,8 +10,8 @@
private final List<PageTitle> titles;
private final Site site;
- public PageQueryTask(int threadCount, Api api, Site site, List<PageTitle>
titles) {
- super(threadCount, api);
+ public PageQueryTask(int concurrencyLevel, Api api, Site site,
List<PageTitle> titles) {
+ super(concurrencyLevel, api);
this.titles = titles;
this.site = site;
}
diff --git
a/wikipedia/src/main/java/org/wikipedia/concurrency/SaneAsyncTask.java
b/wikipedia/src/main/java/org/wikipedia/concurrency/SaneAsyncTask.java
index 18f62e7..f23e041 100644
--- a/wikipedia/src/main/java/org/wikipedia/concurrency/SaneAsyncTask.java
+++ b/wikipedia/src/main/java/org/wikipedia/concurrency/SaneAsyncTask.java
@@ -1,10 +1,12 @@
package org.wikipedia.concurrency;
-import android.os.*;
-
import java.util.concurrent.*;
public abstract class SaneAsyncTask<T> {
+ public static final int SINGLE_THREAD = 1;
+ public static final int LOW_CONCURRENCY = 2;
+ public static final int HIGH_CONCURRENCY = 4;
+
private final BackingAsyncTask underlyingTask;
private final Executor executor;
@@ -20,10 +22,10 @@
/**
* Creates an executor using the default ExecutorService.
*
- * @param threadCount Number of threads to use at max for this thread pool.
+ * @param concurrencyLevel Number of threads to use at max for this thread
pool.
*/
- public SaneAsyncTask(int threadCount) {
- this.executor = ExecutorService.getSingleton().getExecutor(getClass(),
threadCount);
+ public SaneAsyncTask(int concurrencyLevel) {
+ this.executor = ExecutorService.getSingleton().getExecutor(getClass(),
concurrencyLevel);
this.underlyingTask = new BackingAsyncTask();
}
diff --git
a/wikipedia/src/main/java/org/wikipedia/createaccount/CreateAccountTask.java
b/wikipedia/src/main/java/org/wikipedia/createaccount/CreateAccountTask.java
index e0390be..8715cec 100644
--- a/wikipedia/src/main/java/org/wikipedia/createaccount/CreateAccountTask.java
+++ b/wikipedia/src/main/java/org/wikipedia/createaccount/CreateAccountTask.java
@@ -1,7 +1,6 @@
package org.wikipedia.createaccount;
import android.content.*;
-import android.util.*;
import org.json.*;
import org.mediawiki.api.json.*;
import org.wikipedia.*;
@@ -15,7 +14,7 @@
private String token;
public CreateAccountTask(Context context, String username, String
password, String email) {
- super(1,
((WikipediaApp)context.getApplicationContext()).getPrimarySiteApi());
+ super(SINGLE_THREAD,
((WikipediaApp)context.getApplicationContext()).getPrimarySiteApi());
this.username = username;
this.password = password;
@@ -43,7 +42,6 @@
@Override
public CreateAccountResult processResult(ApiResult result) throws
Throwable {
- Log.d("Wikipedia", result.asObject().toString(4));
if (result.asObject().has("error")) {
return new
CreateAccountResult(result.asObject().optJSONObject("error").optString("code"));
}
diff --git a/wikipedia/src/main/java/org/wikipedia/editing/DoEditTask.java
b/wikipedia/src/main/java/org/wikipedia/editing/DoEditTask.java
index 3bf3016..7ee6672 100644
--- a/wikipedia/src/main/java/org/wikipedia/editing/DoEditTask.java
+++ b/wikipedia/src/main/java/org/wikipedia/editing/DoEditTask.java
@@ -1,7 +1,6 @@
package org.wikipedia.editing;
import android.content.*;
-import android.util.*;
import org.json.*;
import org.mediawiki.api.json.*;
import org.wikipedia.*;
@@ -16,7 +15,7 @@
public DoEditTask(Context context, PageTitle title, String
sectionWikitext, int sectionID, String editToken, String summary) {
super(
- 1,
+ SINGLE_THREAD,
((WikipediaApp)context.getApplicationContext()).getAPIForSite(title.getSite())
);
this.title = title;
@@ -51,7 +50,6 @@
// but the block seems to be ready for revisions, so clean up then?
Utils.processHeadersForZero(app, result);
}
- Log.d("Wikipedia", resultJSON.toString(4));
if (resultJSON.has("error")) {
JSONObject errorJSON = resultJSON.optJSONObject("error");
throw new EditingException(errorJSON.optString("code"),
errorJSON.optString("info"));
diff --git a/wikipedia/src/main/java/org/wikipedia/editing/EditPreviewTask.java
b/wikipedia/src/main/java/org/wikipedia/editing/EditPreviewTask.java
index 187fe67..bb7f1eb 100644
--- a/wikipedia/src/main/java/org/wikipedia/editing/EditPreviewTask.java
+++ b/wikipedia/src/main/java/org/wikipedia/editing/EditPreviewTask.java
@@ -11,7 +11,7 @@
public EditPreviewTask(Context context, String wikiText, PageTitle title) {
super(
- 1,
+ SINGLE_THREAD,
((WikipediaApp)context.getApplicationContext()).getAPIForSite(title.getSite())
);
this.wikiText = wikiText;
diff --git
a/wikipedia/src/main/java/org/wikipedia/editing/FetchEditTokenTask.java
b/wikipedia/src/main/java/org/wikipedia/editing/FetchEditTokenTask.java
index 091b6bb..33cd7c8 100644
--- a/wikipedia/src/main/java/org/wikipedia/editing/FetchEditTokenTask.java
+++ b/wikipedia/src/main/java/org/wikipedia/editing/FetchEditTokenTask.java
@@ -7,7 +7,7 @@
public class FetchEditTokenTask extends ApiTask<String> {
public FetchEditTokenTask(Context context, Site site) {
super(
- 1,
+ SINGLE_THREAD,
((WikipediaApp)context.getApplicationContext()).getAPIForSite(site)
);
}
diff --git
a/wikipedia/src/main/java/org/wikipedia/editing/FetchSectionWikitextTask.java
b/wikipedia/src/main/java/org/wikipedia/editing/FetchSectionWikitextTask.java
index 231cbd1..cdb6012 100644
---
a/wikipedia/src/main/java/org/wikipedia/editing/FetchSectionWikitextTask.java
+++
b/wikipedia/src/main/java/org/wikipedia/editing/FetchSectionWikitextTask.java
@@ -12,7 +12,7 @@
public FetchSectionWikitextTask(Context context, PageTitle title, int
sectionID) {
super(
- 1,
+ SINGLE_THREAD,
((WikipediaApp)context.getApplicationContext()).getAPIForSite(title.getSite())
);
this.title = title;
diff --git
a/wikipedia/src/main/java/org/wikipedia/editing/RefreshCaptchaTask.java
b/wikipedia/src/main/java/org/wikipedia/editing/RefreshCaptchaTask.java
index 1e43ff5..b96713b 100644
--- a/wikipedia/src/main/java/org/wikipedia/editing/RefreshCaptchaTask.java
+++ b/wikipedia/src/main/java/org/wikipedia/editing/RefreshCaptchaTask.java
@@ -1,14 +1,13 @@
package org.wikipedia.editing;
import android.content.*;
-import android.util.*;
import org.mediawiki.api.json.*;
import org.wikipedia.*;
public class RefreshCaptchaTask extends ApiTask<CaptchaResult> {
public RefreshCaptchaTask(Context context, Site site) {
super(
- 1,
+ SINGLE_THREAD,
((WikipediaApp)context.getApplicationContext()).getAPIForSite(site)
);
}
@@ -20,7 +19,6 @@
@Override
public CaptchaResult processResult(ApiResult result) throws Throwable {
- Log.d("Wikipedia", result.asObject().toString(4));
return new CaptchaResult(
result.asObject()
.optJSONObject("fancycaptchareload")
diff --git
a/wikipedia/src/main/java/org/wikipedia/eventlogging/EventLoggingEvent.java
b/wikipedia/src/main/java/org/wikipedia/eventlogging/EventLoggingEvent.java
index d9d22ef..3709289 100644
--- a/wikipedia/src/main/java/org/wikipedia/eventlogging/EventLoggingEvent.java
+++ b/wikipedia/src/main/java/org/wikipedia/eventlogging/EventLoggingEvent.java
@@ -77,7 +77,7 @@
private static class LogEventTask extends SaneAsyncTask<Boolean> {
private final JSONObject data;
public LogEventTask(JSONObject data) {
- super(1);
+ super(SINGLE_THREAD);
this.data = data;
}
diff --git
a/wikipedia/src/main/java/org/wikipedia/interlanguage/LangLinksFetchTask.java
b/wikipedia/src/main/java/org/wikipedia/interlanguage/LangLinksFetchTask.java
index 45a5d67..a2e5c83 100644
---
a/wikipedia/src/main/java/org/wikipedia/interlanguage/LangLinksFetchTask.java
+++
b/wikipedia/src/main/java/org/wikipedia/interlanguage/LangLinksFetchTask.java
@@ -12,7 +12,7 @@
private final WikipediaApp app;
public LangLinksFetchTask(Context context, PageTitle title) {
super(
- 1,
+ SINGLE_THREAD,
((WikipediaApp)context.getApplicationContext()).getAPIForSite(title.getSite())
);
this.title = title;
@@ -34,7 +34,6 @@
.optJSONObject("query")
.optJSONObject("pages");
String pageId = (String) pagesJSON.keys().next();
- String fullJSON = result.asObject().toString(4);
if (!pagesJSON.optJSONObject(pageId).has("langlinks")) {
// No links found
if (WikipediaApp.isWikipediaZeroDevmodeOn()) {
diff --git a/wikipedia/src/main/java/org/wikipedia/login/LoginTask.java
b/wikipedia/src/main/java/org/wikipedia/login/LoginTask.java
index 5fb4573..38be930 100644
--- a/wikipedia/src/main/java/org/wikipedia/login/LoginTask.java
+++ b/wikipedia/src/main/java/org/wikipedia/login/LoginTask.java
@@ -13,7 +13,7 @@
private final WikipediaApp app;
public LoginTask(Context context, Site site, String username, String
password) {
- super(1);
+ super(SINGLE_THREAD);
app = (WikipediaApp)context.getApplicationContext();
api = app.getAPIForSite(site);
this.username = username;
diff --git a/wikipedia/src/main/java/org/wikipedia/login/LogoutTask.java
b/wikipedia/src/main/java/org/wikipedia/login/LogoutTask.java
index e56d705..0b5ed90 100644
--- a/wikipedia/src/main/java/org/wikipedia/login/LogoutTask.java
+++ b/wikipedia/src/main/java/org/wikipedia/login/LogoutTask.java
@@ -9,7 +9,7 @@
public LogoutTask(Context context, Site site) {
super(
- 1,
+ SINGLE_THREAD,
((WikipediaApp)context.getApplicationContext()).getAPIForSite(site)
);
app = (WikipediaApp)context.getApplicationContext();
diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
index 58e695b..736d585 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
@@ -4,7 +4,6 @@
import android.os.*;
import android.support.v4.app.*;
import android.support.v4.widget.*;
-import android.util.*;
import android.view.*;
import android.widget.*;
import org.json.*;
@@ -255,7 +254,6 @@
@Override
public List<Section> processResult(ApiResult result) throws Throwable {
- Log.d("Wikipedia", result.asObject().toString(4));
JSONObject mobileView =
result.asObject().optJSONObject("mobileview");
pageProperties = new PageProperties(mobileView);
if (mobileView.has("redirected")) {
diff --git a/wikipedia/src/main/java/org/wikipedia/page/SectionsFetchTask.java
b/wikipedia/src/main/java/org/wikipedia/page/SectionsFetchTask.java
index 90256a4..b8cef7d 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/SectionsFetchTask.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/SectionsFetchTask.java
@@ -14,7 +14,7 @@
public SectionsFetchTask(Context context, PageTitle title, String
sectionsRequested) {
super(
- 1,
+ SINGLE_THREAD,
((WikipediaApp)context.getApplicationContext()).getAPIForSite(title.getSite())
);
this.title = title;
diff --git
a/wikipedia/src/main/java/org/wikipedia/pagehistory/usercontributions/FetchUserContribsTask.java
b/wikipedia/src/main/java/org/wikipedia/pagehistory/usercontributions/FetchUserContribsTask.java
index 631e929..de96a3e 100644
---
a/wikipedia/src/main/java/org/wikipedia/pagehistory/usercontributions/FetchUserContribsTask.java
+++
b/wikipedia/src/main/java/org/wikipedia/pagehistory/usercontributions/FetchUserContribsTask.java
@@ -17,7 +17,7 @@
public FetchUserContribsTask(Context context, Site site, String username,
int numberToFetch, String queryContinue) {
super(
- 1,
+ SINGLE_THREAD,
((WikipediaApp)context.getApplicationContext()).getAPIForSite(site)
);
app = (WikipediaApp)context.getApplicationContext();
diff --git
a/wikipedia/src/main/java/org/wikipedia/pageimages/PageImageSaveTask.java
b/wikipedia/src/main/java/org/wikipedia/pageimages/PageImageSaveTask.java
index 44a574e..c49d14f 100644
--- a/wikipedia/src/main/java/org/wikipedia/pageimages/PageImageSaveTask.java
+++ b/wikipedia/src/main/java/org/wikipedia/pageimages/PageImageSaveTask.java
@@ -8,7 +8,7 @@
public class PageImageSaveTask extends PageImagesTask {
private final WikipediaApp app;
public PageImageSaveTask(WikipediaApp app, Api api, PageTitle title) {
- super(2, api, title.getSite(), Arrays.asList(new PageTitle[] {title}),
96);
+ super(api, title.getSite(), Arrays.asList(new PageTitle[] {title}),
96);
this.app = app;
}
diff --git
a/wikipedia/src/main/java/org/wikipedia/pageimages/PageImagesTask.java
b/wikipedia/src/main/java/org/wikipedia/pageimages/PageImagesTask.java
index 1c2672d..0c1c536 100644
--- a/wikipedia/src/main/java/org/wikipedia/pageimages/PageImagesTask.java
+++ b/wikipedia/src/main/java/org/wikipedia/pageimages/PageImagesTask.java
@@ -10,14 +10,8 @@
private final int thumbSize;
private final int thumbsCount;
- protected PageImagesTask(int threadCount, Api api, Site site,
List<PageTitle> titles, int thumbSize) {
- super(threadCount, api, site, titles);
- this.thumbSize = thumbSize;
- this.thumbsCount = titles.size();
- }
-
public PageImagesTask(Api api, Site site, List<PageTitle> titles, int
thumbSize) {
- super(2, api, site, titles);
+ super(LOW_CONCURRENCY, api, site, titles);
this.thumbSize = thumbSize;
this.thumbsCount = titles.size();
}
diff --git
a/wikipedia/src/main/java/org/wikipedia/random/RandomArticleIdTask.java
b/wikipedia/src/main/java/org/wikipedia/random/RandomArticleIdTask.java
index 25decc1..d72cb66 100644
--- a/wikipedia/src/main/java/org/wikipedia/random/RandomArticleIdTask.java
+++ b/wikipedia/src/main/java/org/wikipedia/random/RandomArticleIdTask.java
@@ -11,7 +11,7 @@
private Site site;
public RandomArticleIdTask(Api api, Site site, Context context) {
- super(1, api);
+ super(SINGLE_THREAD, api);
this.site = site;
this.ctx = context;
}
diff --git
a/wikipedia/src/main/java/org/wikipedia/savedpages/DeleteSavedPageTask.java
b/wikipedia/src/main/java/org/wikipedia/savedpages/DeleteSavedPageTask.java
index 5fafa9b..a7360f2 100644
--- a/wikipedia/src/main/java/org/wikipedia/savedpages/DeleteSavedPageTask.java
+++ b/wikipedia/src/main/java/org/wikipedia/savedpages/DeleteSavedPageTask.java
@@ -8,7 +8,7 @@
private final WikipediaApp app;
private final SavedPage savedPage;
public DeleteSavedPageTask(Context context, SavedPage savedPage) {
- super(1);
+ super(SINGLE_THREAD);
app = (WikipediaApp) context.getApplicationContext();
this.savedPage = savedPage;
}
diff --git
a/wikipedia/src/main/java/org/wikipedia/savedpages/DownloadImageTask.java
b/wikipedia/src/main/java/org/wikipedia/savedpages/DownloadImageTask.java
index 4717150..f8e7df6 100644
--- a/wikipedia/src/main/java/org/wikipedia/savedpages/DownloadImageTask.java
+++ b/wikipedia/src/main/java/org/wikipedia/savedpages/DownloadImageTask.java
@@ -13,7 +13,7 @@
private final URL imageUrl;
public DownloadImageTask(Context context, String imageUrl) {
- super(4);
+ super(HIGH_CONCURRENCY);
this.context = context;
try {
this.imageUrl = new URL(imageUrl);
diff --git
a/wikipedia/src/main/java/org/wikipedia/savedpages/LoadSavedPageTask.java
b/wikipedia/src/main/java/org/wikipedia/savedpages/LoadSavedPageTask.java
index 7919e8a..b61fb27 100644
--- a/wikipedia/src/main/java/org/wikipedia/savedpages/LoadSavedPageTask.java
+++ b/wikipedia/src/main/java/org/wikipedia/savedpages/LoadSavedPageTask.java
@@ -10,7 +10,7 @@
private final PageTitle title;
public LoadSavedPageTask(Context context, PageTitle title) {
- super(1);
+ super(SINGLE_THREAD);
app = (WikipediaApp) context.getApplicationContext();
this.title = title;
}
diff --git a/wikipedia/src/main/java/org/wikipedia/savedpages/SavePageTask.java
b/wikipedia/src/main/java/org/wikipedia/savedpages/SavePageTask.java
index dba56bc..d99e1f2 100644
--- a/wikipedia/src/main/java/org/wikipedia/savedpages/SavePageTask.java
+++ b/wikipedia/src/main/java/org/wikipedia/savedpages/SavePageTask.java
@@ -29,7 +29,7 @@
private CountDownLatch imagesDownloadedLatch;
public SavePageTask(Context context, CommunicationBridge bridge, Page
page) {
- super(1);
+ super(SINGLE_THREAD);
app = (WikipediaApp) context.getApplicationContext();
this.page = page;
this.bridge = bridge;
diff --git
a/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesTask.java
b/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesTask.java
index 1825698..f224811 100644
--- a/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesTask.java
+++ b/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesTask.java
@@ -13,7 +13,7 @@
private final WikipediaApp app;
public SearchArticlesTask(Context context, Api api, Site site, String
prefix) {
- super(4, api);
+ super(HIGH_CONCURRENCY, api);
this.prefix = prefix;
this.site = site;
this.app = (WikipediaApp)context.getApplicationContext();
diff --git a/wikipedia/src/main/java/org/wikipedia/zero/WikipediaZeroTask.java
b/wikipedia/src/main/java/org/wikipedia/zero/WikipediaZeroTask.java
index 17bd9d5..3852aef 100644
--- a/wikipedia/src/main/java/org/wikipedia/zero/WikipediaZeroTask.java
+++ b/wikipedia/src/main/java/org/wikipedia/zero/WikipediaZeroTask.java
@@ -10,7 +10,7 @@
private Context ctx;
public WikipediaZeroTask(Api api, Context context) {
- super(1, api);
+ super(SINGLE_THREAD, api);
this.ctx = context;
}
--
To view, visit https://gerrit.wikimedia.org/r/126237
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8f31ddcc4248f1f938fc1bd1c4c048ca5532de08
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda <yuvipa...@gmail.com>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
