Brion VIBBER has submitted this change and it was merged.
Change subject: Add spaces where required to match checkstyle.
......................................................................
Add spaces where required to match checkstyle.
Nowhere as spaced out as mediawiki is, maaan.
Bug: 63742
Change-Id: I84077454d90b208057f5181d45f08e01093b4539
---
M wikipedia/src/main/java/org/wikipedia/CommunicationBridge.java
M wikipedia/src/main/java/org/wikipedia/NonEmptyValidator.java
M wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
M wikipedia/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java
M wikipedia/src/main/java/org/wikipedia/data/SQLiteContentProvider.java
M wikipedia/src/main/java/org/wikipedia/eventlogging/EventLoggingEvent.java
M wikipedia/src/main/java/org/wikipedia/page/LinkHandler.java
M wikipedia/src/main/java/org/wikipedia/page/SectionsFetchTask.java
M wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
9 files changed, 22 insertions(+), 20 deletions(-)
Approvals:
Brion VIBBER: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wikipedia/src/main/java/org/wikipedia/CommunicationBridge.java
b/wikipedia/src/main/java/org/wikipedia/CommunicationBridge.java
index 091f987..d9bcff9 100644
--- a/wikipedia/src/main/java/org/wikipedia/CommunicationBridge.java
+++ b/wikipedia/src/main/java/org/wikipedia/CommunicationBridge.java
@@ -40,7 +40,7 @@
@Override
public void onMessage(String messageType, JSONObject
messagePayload) {
isDOMReady = true;
- for(String jsString : pendingJSMessages) {
+ for (String jsString : pendingJSMessages) {
CommunicationBridge.this.webView.loadUrl(jsString);
}
}
diff --git a/wikipedia/src/main/java/org/wikipedia/NonEmptyValidator.java
b/wikipedia/src/main/java/org/wikipedia/NonEmptyValidator.java
index 7a0050a..e9b62f2 100644
--- a/wikipedia/src/main/java/org/wikipedia/NonEmptyValidator.java
+++ b/wikipedia/src/main/java/org/wikipedia/NonEmptyValidator.java
@@ -20,10 +20,12 @@
TextWatcher triggerWatcher = new TextWatcher() {
@Override
- public void beforeTextChanged(CharSequence charSequence, int i,
int i2, int i3) {}
+ public void beforeTextChanged(CharSequence charSequence, int i,
int i2, int i3) {
+ }
@Override
- public void onTextChanged(CharSequence charSequence, int i, int
i2, int i3) {}
+ public void onTextChanged(CharSequence charSequence, int i, int
i2, int i3) {
+ }
@Override
public void afterTextChanged(Editable editable) {
diff --git a/wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
b/wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
index 842e6e9..5714f02 100644
--- a/wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
+++ b/wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
@@ -25,12 +25,12 @@
@ReportsCrashes(
- formKey="",
- mode= ReportingInteractionMode.DIALOG,
- resDialogTitle=R.string.acra_report_dialog_title,
- resDialogText=R.string.acra_report_dialog_text,
- resDialogCommentPrompt=R.string.acra_report_dialog_comment,
- mailTo="mobile-android-wikipe...@wikimedia.org")
+ formKey = "",
+ mode = ReportingInteractionMode.DIALOG,
+ resDialogTitle = R.string.acra_report_dialog_title,
+ resDialogText = R.string.acra_report_dialog_text,
+ resDialogCommentPrompt = R.string.acra_report_dialog_comment,
+ mailTo = "mobile-android-wikipe...@wikimedia.org")
public class WikipediaApp extends Application {
private Bus bus;
@@ -77,7 +77,7 @@
PROTOCOL = "https"; // Move this to a preference or something later on
// Enable debugging on the webview
- if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
WebView.setWebContentsDebuggingEnabled(true);
}
diff --git
a/wikipedia/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java
b/wikipedia/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java
index 25eafeb..28c04d8 100644
---
a/wikipedia/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java
+++
b/wikipedia/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java
@@ -19,14 +19,14 @@
public static final int ACTION_CREATE_ACCOUNT = 1;
- @Required(order=1)
+ @Required(order = 1)
private EditText usernameEdit;
- @Required(order=2)
- @Password(order=3)
+ @Required(order = 2)
+ @Password(order = 3)
private EditText passwordEdit;
- @ConfirmPassword(order=4,
messageResId=R.string.create_account_passwords_mismatch_error)
+ @ConfirmPassword(order = 4, messageResId =
R.string.create_account_passwords_mismatch_error)
private EditText passwordRepeatEdit;
- @Email(order=5, messageResId=R.string.create_account_email_error)
+ @Email(order = 5, messageResId = R.string.create_account_email_error)
private EditText emailEdit;
private CheckBox showPasswordCheck;
diff --git
a/wikipedia/src/main/java/org/wikipedia/data/SQLiteContentProvider.java
b/wikipedia/src/main/java/org/wikipedia/data/SQLiteContentProvider.java
index 735da21..d95a20b 100644
--- a/wikipedia/src/main/java/org/wikipedia/data/SQLiteContentProvider.java
+++ b/wikipedia/src/main/java/org/wikipedia/data/SQLiteContentProvider.java
@@ -109,7 +109,7 @@
sqlDB.beginTransaction();
switch (uriType) {
case MATCH_ALL:
- for(ContentValues value: values) {
+ for (ContentValues value: values) {
sqlDB.insert(persistanceHelper.getTableName(), null,
value);
}
break;
diff --git
a/wikipedia/src/main/java/org/wikipedia/eventlogging/EventLoggingEvent.java
b/wikipedia/src/main/java/org/wikipedia/eventlogging/EventLoggingEvent.java
index 0fca254..d9d22ef 100644
--- a/wikipedia/src/main/java/org/wikipedia/eventlogging/EventLoggingEvent.java
+++ b/wikipedia/src/main/java/org/wikipedia/eventlogging/EventLoggingEvent.java
@@ -56,7 +56,7 @@
JSONObject event = new JSONObject();
for (int i = 0; i < payload.length; i += 2) {
- event.put(payload[i], payload[i+1]);
+ event.put(payload[i], payload[i + 1]);
}
data.put("event", event);
diff --git a/wikipedia/src/main/java/org/wikipedia/page/LinkHandler.java
b/wikipedia/src/main/java/org/wikipedia/page/LinkHandler.java
index 2bff0c3..b926813 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/LinkHandler.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/LinkHandler.java
@@ -70,7 +70,7 @@
String authority = uri.getAuthority();
// We don't want to handle /w/ URIs.
// FIXME: Make this more complete, only to not handle URIs
that contain unsupported actions
- if(authority != null && Site.isSupportedSite(authority) &&
uri.getPath().startsWith("/wiki/")) {
+ if (authority != null && Site.isSupportedSite(authority) &&
uri.getPath().startsWith("/wiki/")) {
Site site = new Site(authority);
//TODO: Handle fragments
PageTitle title = site.titleForInternalLink(uri.getPath());
diff --git a/wikipedia/src/main/java/org/wikipedia/page/SectionsFetchTask.java
b/wikipedia/src/main/java/org/wikipedia/page/SectionsFetchTask.java
index 4853138..2031363 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/SectionsFetchTask.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/SectionsFetchTask.java
@@ -38,7 +38,7 @@
JSONArray sectionsJSON =
result.asObject().optJSONObject("mobileview").optJSONArray("sections");
ArrayList<Section> sections = new ArrayList<Section>();
- for (int i=0; i < sectionsJSON.length(); i++) {
+ for (int i = 0; i < sectionsJSON.length(); i++) {
Section newSection = new Section(sectionsJSON.getJSONObject(i));
sections.add(newSection);
}
diff --git
a/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
b/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
index e29a734..2f18077 100644
--- a/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
@@ -92,7 +92,7 @@
(int)(48f * WikipediaApp.SCREEN_DENSITY)) {
@Override
public void onFinish(Map<PageTitle, String> result) {
- for(Map.Entry<PageTitle, String> entry :
result.entrySet()) {
+ for (Map.Entry<PageTitle, String> entry :
result.entrySet()) {
if (entry.getValue() == null) {
continue;
}
--
To view, visit https://gerrit.wikimedia.org/r/126112
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I84077454d90b208057f5181d45f08e01093b4539
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
