Niedzielski has uploaded a new change for review.
https://gerrit.wikimedia.org/r/265579
Change subject: Hygiene: rename Site usage from "primary" to "app"
......................................................................
Hygiene: rename Site usage from "primary" to "app"
"Primary" is unclear. We have an app language (which still has some ties
to the system language) and an article language. Similarly, we have an
app site and an article site. Remove "primary" terminology and just use
"site" when communicating with WikipediaApp. No functional changes
intended.
Change-Id: I1ca807abe0b90c9288ce3e9a8ee5145f49e21387
---
M app/src/main/java/org/wikipedia/WikipediaApp.java
M app/src/main/java/org/wikipedia/analytics/Funnel.java
M app/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java
M app/src/main/java/org/wikipedia/createaccount/CreateAccountTask.java
M app/src/main/java/org/wikipedia/editing/EditSectionActivity.java
M app/src/main/java/org/wikipedia/login/LoginActivity.java
M app/src/main/java/org/wikipedia/nearby/NearbyFragment.java
M app/src/main/java/org/wikipedia/page/DisambigListAdapter.java
M app/src/main/java/org/wikipedia/page/PageActivity.java
M app/src/main/java/org/wikipedia/page/ToCHandler.java
M app/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java
M app/src/main/java/org/wikipedia/random/RandomHandler.java
M app/src/main/java/org/wikipedia/search/SearchResultsFragment.java
M app/src/main/java/org/wikipedia/theme/ThemeChooserDialog.java
M app/src/main/java/org/wikipedia/widgets/WidgetProviderFeaturedPage.java
M app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java
16 files changed, 33 insertions(+), 32 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/79/265579/1
diff --git a/app/src/main/java/org/wikipedia/WikipediaApp.java
b/app/src/main/java/org/wikipedia/WikipediaApp.java
index 6373d35..778bcea 100644
--- a/app/src/main/java/org/wikipedia/WikipediaApp.java
+++ b/app/src/main/java/org/wikipedia/WikipediaApp.java
@@ -100,7 +100,7 @@
private EditTokenStorage editTokenStorage;
private SharedPreferenceCookieManager cookieManager;
private String userAgent;
- private Site primarySite;
+ private Site site;
private CrashReporter crashReporter;
@@ -249,24 +249,25 @@
}
/**
- * Default site of the application
- * You should use PageTitle.getSite() to get the currently browsed site
+ * Default site for the app
+ * You should use PageTitle.getSite() to get the article site
*/
- public Site getPrimarySite() {
- if (primarySite == null) {
- primarySite = Site.forLanguage(getAppOrSystemLanguageCode());
+ public Site getSite() {
+ // TODO: why don't we ensure that the app language hasn't changed here
instead of the client?
+ if (site == null) {
+ site = Site.forLanguage(getAppOrSystemLanguageCode());
}
- return primarySite;
+ return site;
}
/**
- * Convenience method to get an API object for the primary site.
+ * Convenience method to get an API object for the app site.
*
- * @return An API object that is equivalent to calling
getAPIForSite(getPrimarySite)
+ * @return An API object that is equivalent to calling
getAPIForSite(getSite)
*/
- public Api getPrimarySiteApi() {
- return getAPIForSite(getPrimarySite());
+ public Api getSiteApi() {
+ return getAPIForSite(getSite());
}
@Nullable
@@ -515,7 +516,7 @@
}
public void resetSite() {
- primarySite = null;
+ site = null;
}
public OnboardingStateMachine getOnboardingStateMachine() {
diff --git a/app/src/main/java/org/wikipedia/analytics/Funnel.java
b/app/src/main/java/org/wikipedia/analytics/Funnel.java
index b16afaa..118cce4 100644
--- a/app/src/main/java/org/wikipedia/analytics/Funnel.java
+++ b/app/src/main/java/org/wikipedia/analytics/Funnel.java
@@ -147,7 +147,7 @@
new EventLoggingEvent(
schemaName,
revision,
- getDBNameForSite(site == null ?
getApp().getPrimarySite() : site),
+ getDBNameForSite(site == null ? getApp().getSite() :
site),
app.getUserAgent(),
preprocessData(eventData)
).log();
diff --git
a/app/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java
b/app/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java
index 42a63d3..5949ce3 100644
--- a/app/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java
+++ b/app/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java
@@ -91,7 +91,7 @@
progressDialog.setCancelable(false);
progressDialog.setMessage(getString(R.string.dialog_create_account_checking_progress));
- captchaHandler = new CaptchaHandler(this, app.getPrimarySite(),
progressDialog, primaryContainer,
+ captchaHandler = new CaptchaHandler(this, app.getSite(),
progressDialog, primaryContainer,
getString(R.string.create_account_activity_title),
getString(R.string.create_account_button));
diff --git
a/app/src/main/java/org/wikipedia/createaccount/CreateAccountTask.java
b/app/src/main/java/org/wikipedia/createaccount/CreateAccountTask.java
index b921c1d..4203525 100644
--- a/app/src/main/java/org/wikipedia/createaccount/CreateAccountTask.java
+++ b/app/src/main/java/org/wikipedia/createaccount/CreateAccountTask.java
@@ -18,7 +18,7 @@
private String token;
public CreateAccountTask(Context context, String username, String
password, String email) {
-
super(((WikipediaApp)context.getApplicationContext()).getPrimarySiteApi());
+ super(((WikipediaApp)context.getApplicationContext()).getSiteApi());
this.username = username;
this.password = password;
diff --git a/app/src/main/java/org/wikipedia/editing/EditSectionActivity.java
b/app/src/main/java/org/wikipedia/editing/EditSectionActivity.java
index e94bbac..a96b86d 100644
--- a/app/src/main/java/org/wikipedia/editing/EditSectionActivity.java
+++ b/app/src/main/java/org/wikipedia/editing/EditSectionActivity.java
@@ -380,7 +380,7 @@
app.getCookieManager().clearAllCookies();
User user = app.getUserInfoStorage().getUser();
- new LoginTask(app, app.getPrimarySite(), user.getUsername(),
user.getPassword()) {
+ new LoginTask(app, app.getSite(), user.getUsername(),
user.getPassword()) {
@Override
public void onFinish(LoginResult result) {
if (result.getCode().equals("Success")) {
diff --git a/app/src/main/java/org/wikipedia/login/LoginActivity.java
b/app/src/main/java/org/wikipedia/login/LoginActivity.java
index c7d7cd6..fc0af89 100644
--- a/app/src/main/java/org/wikipedia/login/LoginActivity.java
+++ b/app/src/main/java/org/wikipedia/login/LoginActivity.java
@@ -174,7 +174,7 @@
private void doLogin() {
final String username = usernameText.getText().toString();
final String password = passwordText.getText().toString();
- new LoginTask(this, app.getPrimarySite(), username, password) {
+ new LoginTask(this, app.getSite(), username, password) {
@Override
public void onBeforeExecute() {
progressDialog.show();
diff --git a/app/src/main/java/org/wikipedia/nearby/NearbyFragment.java
b/app/src/main/java/org/wikipedia/nearby/NearbyFragment.java
index f3e973d..847dc59 100644
--- a/app/src/main/java/org/wikipedia/nearby/NearbyFragment.java
+++ b/app/src/main/java/org/wikipedia/nearby/NearbyFragment.java
@@ -59,7 +59,7 @@
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- site = WikipediaApp.getInstance().getPrimarySite();
+ site = WikipediaApp.getInstance().getSite();
}
@Override
diff --git a/app/src/main/java/org/wikipedia/page/DisambigListAdapter.java
b/app/src/main/java/org/wikipedia/page/DisambigListAdapter.java
index 1527aad..3347e5c 100644
--- a/app/src/main/java/org/wikipedia/page/DisambigListAdapter.java
+++ b/app/src/main/java/org/wikipedia/page/DisambigListAdapter.java
@@ -41,7 +41,7 @@
this.activity = activity;
this.items = items;
app = (WikipediaApp) getContext().getApplicationContext();
- site = app.getPrimarySite();
+ site = app.getSite();
requestPageImages();
fetchDescriptions();
}
@@ -95,7 +95,7 @@
return;
}
- new GetDescriptionsTask(app.getPrimarySiteApi(), site, titleList) {
+ new GetDescriptionsTask(app.getSiteApi(), site, titleList) {
@Override
public void onFinish(Map<PageTitle, Void> result) {
notifyDataSetChanged();
diff --git a/app/src/main/java/org/wikipedia/page/PageActivity.java
b/app/src/main/java/org/wikipedia/page/PageActivity.java
index 930299f..0e1e95c 100644
--- a/app/src/main/java/org/wikipedia/page/PageActivity.java
+++ b/app/src/main/java/org/wikipedia/page/PageActivity.java
@@ -421,7 +421,7 @@
loadPage(title, historyEntry);
} else if (Intent.ACTION_SEARCH.equals(intent.getAction())) {
String query = intent.getStringExtra(SearchManager.QUERY);
- PageTitle title = new PageTitle(query, app.getPrimarySite());
+ PageTitle title = new PageTitle(query, app.getSite());
HistoryEntry historyEntry = new HistoryEntry(title,
HistoryEntry.SOURCE_SEARCH);
loadPageInForegroundTab(title, historyEntry);
} else if (Intent.ACTION_SEND.equals(intent.getAction())
@@ -659,7 +659,7 @@
* @param mustBeEmpty If true, and a tab exists already, do nothing.
*/
public void loadMainPage(boolean allowStateLoss, TabPosition position,
boolean mustBeEmpty) {
- PageTitle title = new
PageTitle(MainPageNameData.valueFor(app.getAppOrSystemLanguageCode()),
app.getPrimarySite());
+ PageTitle title = new
PageTitle(MainPageNameData.valueFor(app.getAppOrSystemLanguageCode()),
app.getSite());
HistoryEntry historyEntry = new HistoryEntry(title,
HistoryEntry.SOURCE_MAIN_PAGE);
loadPage(title, historyEntry, position, allowStateLoss, mustBeEmpty);
}
diff --git a/app/src/main/java/org/wikipedia/page/ToCHandler.java
b/app/src/main/java/org/wikipedia/page/ToCHandler.java
index 9249a9a..26926a4 100755
--- a/app/src/main/java/org/wikipedia/page/ToCHandler.java
+++ b/app/src/main/java/org/wikipedia/page/ToCHandler.java
@@ -96,7 +96,7 @@
// create a dummy funnel, in case the drawer is pulled out before a
page is loaded.
funnel = new ToCInteractionFunnel(WikipediaApp.getInstance(),
- WikipediaApp.getInstance().getPrimarySite(), 0, 0);
+ WikipediaApp.getInstance().getSite(), 0, 0);
slidingPane.setDrawerListener(new DrawerLayout.SimpleDrawerListener() {
private boolean sectionRequested = false;
diff --git a/app/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java
b/app/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java
index c8e2fe7..0f1e2e0 100644
--- a/app/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java
+++ b/app/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java
@@ -320,7 +320,7 @@
public void onUrlClick(String url) {
Log.v(TAG, "Link clicked was " + url);
url = resolveProtocolRelativeUrl(url);
- Site site = app.getPrimarySite();
+ Site site = app.getSite();
if (url.startsWith("/wiki/")) {
PageTitle title = site.titleForInternalLink(url);
finishWithPageResult(title);
diff --git a/app/src/main/java/org/wikipedia/random/RandomHandler.java
b/app/src/main/java/org/wikipedia/random/RandomHandler.java
index 998e91b..0355abf 100644
--- a/app/src/main/java/org/wikipedia/random/RandomHandler.java
+++ b/app/src/main/java/org/wikipedia/random/RandomHandler.java
@@ -43,7 +43,7 @@
Handler randomHandler = new Handler(new Handler.Callback() {
@Override
public boolean handleMessage(Message msg) {
- RandomArticleIdTask randomTask = new
RandomArticleIdTask(app.getAPIForSite(app.getPrimarySite()),
app.getPrimarySite()) {
+ RandomArticleIdTask randomTask = new
RandomArticleIdTask(app.getAPIForSite(app.getSite()), app.getSite()) {
@Override
public void onBeforeExecute() {
diff --git a/app/src/main/java/org/wikipedia/search/SearchResultsFragment.java
b/app/src/main/java/org/wikipedia/search/SearchResultsFragment.java
index 2f2b173..42f589f 100644
--- a/app/src/main/java/org/wikipedia/search/SearchResultsFragment.java
+++ b/app/src/main/java/org/wikipedia/search/SearchResultsFragment.java
@@ -212,7 +212,7 @@
private void doTitlePrefixSearch(final String searchTerm) {
// Use nanoTime to measure the time the search was started.
final long startTime = System.nanoTime();
- TitleSearchTask searchTask = new
TitleSearchTask(app.getAPIForSite(app.getPrimarySite()), app.getPrimarySite(),
searchTerm) {
+ TitleSearchTask searchTask = new
TitleSearchTask(app.getAPIForSite(app.getSite()), app.getSite(), searchTerm) {
@Override
public void onBeforeExecute() {
getPageActivity().updateProgressBar(true, true, 0);
@@ -309,7 +309,7 @@
final boolean clearOnSuccess) {
// Use nanoTime to measure the time the search was started.
final long startTime = System.nanoTime();
- new FullSearchArticlesTask(app.getAPIForSite(app.getPrimarySite()),
app.getPrimarySite(),
+ new FullSearchArticlesTask(app.getAPIForSite(app.getSite()),
app.getSite(),
searchTerm, BATCH_SIZE, continueOffset,
false) {
@Override
public void onBeforeExecute() {
diff --git a/app/src/main/java/org/wikipedia/theme/ThemeChooserDialog.java
b/app/src/main/java/org/wikipedia/theme/ThemeChooserDialog.java
index 0e68507..41d1bde 100644
--- a/app/src/main/java/org/wikipedia/theme/ThemeChooserDialog.java
+++ b/app/src/main/java/org/wikipedia/theme/ThemeChooserDialog.java
@@ -27,7 +27,7 @@
public ThemeChooserDialog(Context context) {
super(context, R.layout.dialog_themechooser);
app = WikipediaApp.getInstance();
- funnel = new AppearanceChangeFunnel(app, app.getPrimarySite());
+ funnel = new AppearanceChangeFunnel(app, app.getSite());
buttonDecreaseTextSize = (Button)
getDialogLayout().findViewById(R.id.buttonDecreaseTextSize);
buttonDecreaseTextSize.setOnClickListener(new View.OnClickListener() {
diff --git
a/app/src/main/java/org/wikipedia/widgets/WidgetProviderFeaturedPage.java
b/app/src/main/java/org/wikipedia/widgets/WidgetProviderFeaturedPage.java
index be356eb..4969a65 100644
--- a/app/src/main/java/org/wikipedia/widgets/WidgetProviderFeaturedPage.java
+++ b/app/src/main/java/org/wikipedia/widgets/WidgetProviderFeaturedPage.java
@@ -75,7 +75,7 @@
WikipediaApp app = WikipediaApp.getInstance();
final PageTitle title = new PageTitle(
MainPageNameData.valueFor(app.getAppOrSystemLanguageCode()),
- app.getPrimarySite());
+ app.getSite());
getApiService(title).pageLead(title.getPrefixedText(),
calculateLeadImageWidth(),
!app.isImageDownloadEnabled(), new PageLead.Callback() {
@@ -114,7 +114,7 @@
|| (text.getSpanEnd(span) - text.getSpanStart(span) <= 1))
{
continue;
}
- PageTitle title = WikipediaApp.getInstance().getPrimarySite()
+ PageTitle title = WikipediaApp.getInstance().getSite()
.titleForInternalLink(decodeURL(span.getURL()));
if (!title.isFilePage() && !title.isSpecial()) {
titleText = title.getDisplayText();
diff --git a/app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java
b/app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java
index 58c32a3..94350d9 100644
--- a/app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java
+++ b/app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java
@@ -177,7 +177,7 @@
Handler wikipediaZeroRandomHandler = new Handler(new
Handler.Callback() {
@Override
public boolean handleMessage(Message msg) {
- RandomArticleIdTask randomTask = new
RandomArticleIdTask(app.getAPIForSite(app.getPrimarySite()),
app.getPrimarySite()) {
+ RandomArticleIdTask randomTask = new
RandomArticleIdTask(app.getAPIForSite(app.getSite()), app.getSite()) {
@Override
public void onCatch(Throwable caught) {
// oh snap
@@ -211,7 +211,7 @@
@Override
public boolean handleMessage(Message msg) {
- WikipediaZeroTask zeroTask = new
WikipediaZeroTask(app.getAPIForSite(app.getPrimarySite()), app.getUserAgent()) {
+ WikipediaZeroTask zeroTask = new
WikipediaZeroTask(app.getAPIForSite(app.getSite()), app.getUserAgent()) {
@Override
public void onFinish(ZeroMessage message) {
Log.d("Wikipedia", "Wikipedia Zero message: " +
message);
--
To view, visit https://gerrit.wikimedia.org/r/265579
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1ca807abe0b90c9288ce3e9a8ee5145f49e21387
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
