BearND has uploaded a new change for review.
https://gerrit.wikimedia.org/r/179492
Change subject: Code inspections
......................................................................
Code inspections
Fix some low hanging fruit code inspections in Android Studio
Change-Id: Ib3845d2a65a37b7dbef8c619fcce3a3d6d59afcd
---
M wikipedia-it/pom.xml
M wikipedia-it/src/main/java/org/wikipedia/test/CreateAccountTokenTest.java
M wikipedia-it/src/main/java/org/wikipedia/test/TranslationTests.java
M wikipedia/pom.xml
M wikipedia/res/layout/activity_about.xml
M wikipedia/res/layout/dialog_themechooser.xml
M wikipedia/res/layout/fragment_history.xml
M wikipedia/res/layout/fragment_navdrawer.xml
M wikipedia/res/layout/fragment_page.xml
M wikipedia/res/layout/fragment_saved_pages.xml
M wikipedia/res/layout/item_saved_page_entry.xml
M wikipedia/res/layout/simple_list_item_activated_2.xml
M wikipedia/res/values-gl/strings.xml
M wikipedia/res/values/last_updated.xml
M wikipedia/src/main/java/org/wikipedia/NonEmptyValidator.java
M wikipedia/src/main/java/org/wikipedia/Utils.java
M wikipedia/src/main/java/org/wikipedia/bridge/CommunicationBridge.java
M wikipedia/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java
M wikipedia/src/main/java/org/wikipedia/settings/PreferenceActivityWithBack.java
M wikipedia/src/main/java/org/wikipedia/views/ObservableWebView.java
20 files changed, 34 insertions(+), 25 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/92/179492/1
diff --git a/wikipedia-it/pom.xml b/wikipedia-it/pom.xml
index 0774ac0..039dfd6 100644
--- a/wikipedia-it/pom.xml
+++ b/wikipedia-it/pom.xml
@@ -9,7 +9,6 @@
<version>1.0-SNAPSHOT</version>
</parent>
- <groupId>org.wikimedia</groupId>
<artifactId>wikipedia-it</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>apk</packaging>
diff --git
a/wikipedia-it/src/main/java/org/wikipedia/test/CreateAccountTokenTest.java
b/wikipedia-it/src/main/java/org/wikipedia/test/CreateAccountTokenTest.java
index f179599..476141f 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/CreateAccountTokenTest.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/CreateAccountTokenTest.java
@@ -24,7 +24,6 @@
final Site testWiki = new Site("test.wikipedia.org");
final String username = "someusername" + System.currentTimeMillis();
final String password = "somepassword" + System.currentTimeMillis();
- final WikipediaApp app =
(WikipediaApp)getInstrumentation().getTargetContext().getApplicationContext();
final CountDownLatch completionLatch = new CountDownLatch(1);
runTestOnUiThread(new Runnable() {
diff --git
a/wikipedia-it/src/main/java/org/wikipedia/test/TranslationTests.java
b/wikipedia-it/src/main/java/org/wikipedia/test/TranslationTests.java
index f4dd535..dc9a5dc 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/TranslationTests.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/TranslationTests.java
@@ -169,7 +169,7 @@
}
}
- public void checkTranslationHasParameter(Res res, String paramName, Object
val1, String alternateFormat) throws Exception {
+ public void checkTranslationHasParameter(Res res, String paramName, Object
val1, String alternateFormat) {
String translatedString =
getInstrumentation().getTargetContext().getString(res.id, val1);
// Log.i(TAG, myLocale + ":" + translatedString);
if (!translatedString.contains(String.format(paramName, val1))
diff --git a/wikipedia/pom.xml b/wikipedia/pom.xml
index 46b3abf..1193d4d 100644
--- a/wikipedia/pom.xml
+++ b/wikipedia/pom.xml
@@ -9,7 +9,6 @@
<version>1.0-SNAPSHOT</version>
</parent>
- <groupId>org.wikimedia</groupId>
<artifactId>wikipedia</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>apk</packaging>
diff --git a/wikipedia/res/layout/activity_about.xml
b/wikipedia/res/layout/activity_about.xml
index 8003ce9..065f968 100644
--- a/wikipedia/res/layout/activity_about.xml
+++ b/wikipedia/res/layout/activity_about.xml
@@ -25,6 +25,7 @@
android:layout_width="96dp"
android:layout_height="96dp"
android:src="@drawable/about_logo"
+ android:contentDescription="@null"
/>
<LinearLayout android:layout_width="0dp"
android:layout_height="72dp"
diff --git a/wikipedia/res/layout/dialog_themechooser.xml
b/wikipedia/res/layout/dialog_themechooser.xml
index d6ea87c..c9a9335 100644
--- a/wikipedia/res/layout/dialog_themechooser.xml
+++ b/wikipedia/res/layout/dialog_themechooser.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android";
+ xmlns:tools="http://schemas.android.com/tools";
android:layout_width="match_parent"
android:layout_height="wrap_content">
@@ -34,7 +35,7 @@
android:layout_margin="0dp"
android:text="−"
android:textSize="26sp"
- />
+ tools:ignore="HardcodedText"/>
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -46,7 +47,7 @@
android:layout_marginBottom="0dp"
android:text="○"
android:textSize="26sp"
- />
+ tools:ignore="HardcodedText"/>
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -55,7 +56,7 @@
android:layout_margin="0dp"
android:text="+"
android:textSize="26sp"
- />
+ tools:ignore="HardcodedText"/>
</LinearLayout>
<View
@@ -84,6 +85,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/buttonColorsLight"
+ android:layout_marginLeft="6dp"
+ android:layout_marginRight="6dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:paddingLeft="28dp"
@@ -96,7 +99,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/buttonColorsDark"
- android:layout_marginLeft="12dp"
+ android:layout_marginLeft="6dp"
+ android:layout_marginRight="6dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:paddingLeft="28dp"
@@ -112,7 +116,7 @@
<ProgressBar
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="top|right"
+ android:layout_gravity="top|end"
android:layout_margin="8dp"
android:id="@+id/font_change_progress_bar"/>
diff --git a/wikipedia/res/layout/fragment_history.xml
b/wikipedia/res/layout/fragment_history.xml
index 80bd4d9..6cc11b1 100644
--- a/wikipedia/res/layout/fragment_history.xml
+++ b/wikipedia/res/layout/fragment_history.xml
@@ -16,7 +16,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
- android:src="@drawable/recent"/>
+ android:src="@drawable/recent"
+ android:contentDescription="@null"/>
<TextView
android:id="@+id/history_empty_title"
android:layout_width="wrap_content"
diff --git a/wikipedia/res/layout/fragment_navdrawer.xml
b/wikipedia/res/layout/fragment_navdrawer.xml
index 6b56ff0..0200219 100644
--- a/wikipedia/res/layout/fragment_navdrawer.xml
+++ b/wikipedia/res/layout/fragment_navdrawer.xml
@@ -28,8 +28,6 @@
android:background="@drawable/nav_item_background"
android:paddingTop="8dp"
android:paddingBottom="8dp"
- android:paddingEnd="8dp"
- android:paddingRight="8dp"
>
<ImageView android:layout_width="24dp" android:layout_height="24dp"
android:layout_margin="12dp"
diff --git a/wikipedia/res/layout/fragment_page.xml
b/wikipedia/res/layout/fragment_page.xml
index e12215e..997e356 100644
--- a/wikipedia/res/layout/fragment_page.xml
+++ b/wikipedia/res/layout/fragment_page.xml
@@ -45,7 +45,8 @@
android:id="@+id/page_image_placeholder"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:scaleType="centerCrop"/>
+ android:scaleType="centerCrop"
+ android:contentDescription="@null"/>
<FrameLayout
android:id="@+id/page_title_container"
android:layout_width="match_parent"
diff --git a/wikipedia/res/layout/fragment_saved_pages.xml
b/wikipedia/res/layout/fragment_saved_pages.xml
index ab79163..b0cc9aa 100644
--- a/wikipedia/res/layout/fragment_saved_pages.xml
+++ b/wikipedia/res/layout/fragment_saved_pages.xml
@@ -16,7 +16,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
- android:src="@drawable/savedpages"/>
+ android:src="@drawable/savedpages"
+ android:contentDescription="@null"/>
<TextView
android:id="@+id/saved_pages_empty_title"
android:layout_width="wrap_content"
diff --git a/wikipedia/res/layout/item_saved_page_entry.xml
b/wikipedia/res/layout/item_saved_page_entry.xml
index 68d0294..84b1beb 100644
--- a/wikipedia/res/layout/item_saved_page_entry.xml
+++ b/wikipedia/res/layout/item_saved_page_entry.xml
@@ -31,7 +31,7 @@
android:layout_gravity="center_vertical"
android:src="@drawable/ic_pageimage_placeholder"
android:background="@android:color/transparent"
- />
+ android:contentDescription="@null"/>
<TextView
android:id="@+id/saved_page_title"
diff --git a/wikipedia/res/layout/simple_list_item_activated_2.xml
b/wikipedia/res/layout/simple_list_item_activated_2.xml
index 8e372da..4a129a0 100644
--- a/wikipedia/res/layout/simple_list_item_activated_2.xml
+++ b/wikipedia/res/layout/simple_list_item_activated_2.xml
@@ -29,6 +29,7 @@
<TextView android:id="@android:id/text1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_marginLeft="6dip"
android:layout_marginStart="6dip"
android:layout_marginTop="6dip"
android:textAppearance="?android:attr/textAppearanceLarge"
@@ -38,6 +39,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@android:id/text1"
+ android:layout_alignLeft="@android:id/text1"
android:layout_alignStart="@android:id/text1"
android:textAppearance="?android:attr/textAppearanceSmall"
/>
diff --git a/wikipedia/res/values-gl/strings.xml
b/wikipedia/res/values-gl/strings.xml
index b64545e..3d5e0e6 100644
--- a/wikipedia/res/values-gl/strings.xml
+++ b/wikipedia/res/values-gl/strings.xml
@@ -44,7 +44,7 @@
<string name="nav_item_nearby">Preto</string>
<string name="menu_update_nearby">Actualizar preto</string>
<string name="nearby_empty_title">Non hai páxinas achegadas aquí!</string>
- <string name="nearby_distance_in_meters">%s m</string>
+ <string name="nearby_distance_in_meters">%d m</string>
<string name="nearby_distance_in_kilometers">%.2f km</string>
<string name="nearby_distance_in_feet">%d pés</string>
<string name="nearby_distance_in_miles">%.2f millas</string>
diff --git a/wikipedia/res/values/last_updated.xml
b/wikipedia/res/values/last_updated.xml
index 7d8fc9f..1841d23 100644
--- a/wikipedia/res/values/last_updated.xml
+++ b/wikipedia/res/values/last_updated.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools";
tools:ignore="MissingTranslation">
<!-- timestamp of when the bundled styles were last updated in ISO 8601-->
- <string name="bundled_styles_updated">2019-06-17T00:00:00Z</string>
+ <string name="bundled_styles_updated"
tools:ignore="TypographyDashes">2019-06-17T00:00:00Z</string>
</resources>
\ No newline at end of file
diff --git a/wikipedia/src/main/java/org/wikipedia/NonEmptyValidator.java
b/wikipedia/src/main/java/org/wikipedia/NonEmptyValidator.java
index 9753a93..b8a6514 100644
--- a/wikipedia/src/main/java/org/wikipedia/NonEmptyValidator.java
+++ b/wikipedia/src/main/java/org/wikipedia/NonEmptyValidator.java
@@ -34,16 +34,16 @@
}
};
- for (int i = 0; i < editTexts.length; i++) {
- editTexts[i].addTextChangedListener(triggerWatcher);
+ for (EditText editText : editTexts) {
+ editText.addTextChangedListener(triggerWatcher);
}
}
private boolean lastIsValidValue = false;
private void revalidate() {
boolean isValid = true;
- for (int i = 0; i < editTexts.length; i++) {
- isValid = isValid && editTexts[i].getText().length() != 0;
+ for (EditText editText : editTexts) {
+ isValid = isValid && editText.getText().length() != 0;
}
if (isValid != lastIsValidValue) {
diff --git a/wikipedia/src/main/java/org/wikipedia/Utils.java
b/wikipedia/src/main/java/org/wikipedia/Utils.java
index 5fe419c..afd7151 100644
--- a/wikipedia/src/main/java/org/wikipedia/Utils.java
+++ b/wikipedia/src/main/java/org/wikipedia/Utils.java
@@ -424,7 +424,7 @@
// intent from the list, since the chooser already has it, and
we don't need to
// add it again in putExtra. (initialize with the last item in
the list, to preserve order)
Intent chooserIntent =
Intent.createChooser(browserIntents.remove(browserIntents.size() - 1), null);
- chooserIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS,
browserIntents.toArray(new Parcelable[]{}));
+ chooserIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS,
browserIntents.toArray(new Parcelable[browserIntents.size()]));
context.startActivity(chooserIntent);
return;
}
diff --git
a/wikipedia/src/main/java/org/wikipedia/bridge/CommunicationBridge.java
b/wikipedia/src/main/java/org/wikipedia/bridge/CommunicationBridge.java
index 5c9a1cc..f25993c 100644
--- a/wikipedia/src/main/java/org/wikipedia/bridge/CommunicationBridge.java
+++ b/wikipedia/src/main/java/org/wikipedia/bridge/CommunicationBridge.java
@@ -1,5 +1,6 @@
package org.wikipedia.bridge;
+import android.annotation.SuppressLint;
import android.os.Handler;
import android.os.Looper;
import android.os.Message;
@@ -34,6 +35,7 @@
void onMessage(String messageType, JSONObject messagePayload);
}
+ @SuppressLint({"AddJavascriptInterface", "SetJavaScriptEnabled"})
public CommunicationBridge(final WebView webView, final String baseURL) {
this.webView = webView;
this.marshaller = new BridgeMarshaller();
diff --git
a/wikipedia/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java
b/wikipedia/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java
index 33b3c99..239ed22 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java
@@ -208,7 +208,7 @@
} else {
Uri uri = Uri.parse(url);
String authority = uri.getAuthority();
- if (authority != null && site.isSupportedSite(authority)
+ if (authority != null && Site.isSupportedSite(authority)
&& uri.getPath().startsWith("/wiki/")) {
PageTitle title = site.titleForUri(uri);
finishWithPageResult(title);
diff --git
a/wikipedia/src/main/java/org/wikipedia/settings/PreferenceActivityWithBack.java
b/wikipedia/src/main/java/org/wikipedia/settings/PreferenceActivityWithBack.java
index bb25445..ccbe8a7 100644
---
a/wikipedia/src/main/java/org/wikipedia/settings/PreferenceActivityWithBack.java
+++
b/wikipedia/src/main/java/org/wikipedia/settings/PreferenceActivityWithBack.java
@@ -5,7 +5,7 @@
import android.view.MenuItem;
import org.wikipedia.WikipediaApp;
-public class PreferenceActivityWithBack extends PreferenceActivity {
+public abstract class PreferenceActivityWithBack extends PreferenceActivity {
public void onCreate(Bundle savedInstanceState) {
setTheme(WikipediaApp.getInstance().getCurrentTheme());
diff --git a/wikipedia/src/main/java/org/wikipedia/views/ObservableWebView.java
b/wikipedia/src/main/java/org/wikipedia/views/ObservableWebView.java
index 817e9d8..325ef33 100644
--- a/wikipedia/src/main/java/org/wikipedia/views/ObservableWebView.java
+++ b/wikipedia/src/main/java/org/wikipedia/views/ObservableWebView.java
@@ -11,6 +11,8 @@
import java.util.List;
public class ObservableWebView extends WebView {
+ private static final WebViewInvalidateEvent INVALIDATE_EVENT = new
WebViewInvalidateEvent();
+
private List<OnScrollChangeListener> onScrollChangeListeners;
private List<OnDownMotionEventListener> onDownMotionEventListeners;
private List<OnUpOrCancelMotionEventListener>
onUpOrCancelMotionEventListeners;
@@ -120,6 +122,6 @@
listener.onContentHeightChanged(contentHeight);
}
}
- WikipediaApp.getInstance().getBus().post(new WebViewInvalidateEvent());
+ WikipediaApp.getInstance().getBus().post(INVALIDATE_EVENT);
}
}
--
To view, visit https://gerrit.wikimedia.org/r/179492
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib3845d2a65a37b7dbef8c619fcce3a3d6d59afcd
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND <bsitzm...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
