[MediaWiki-commits] [Gerrit] Code inspections - change (apps...wikipedia)
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 @@ version1.0-SNAPSHOT/version /parent -groupIdorg.wikimedia/groupId artifactIdwikipedia-it/artifactId version1.0-SNAPSHOT/version packagingapk/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 @@ version1.0-SNAPSHOT/version /parent -groupIdorg.wikimedia/groupId artifactIdwikipedia/artifactId version1.0-SNAPSHOT/version packagingapk/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 @@
[MediaWiki-commits] [Gerrit] Code inspections - change (apps...wikipedia)
Dbrant has submitted this change and it was merged. 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(-) Approvals: Dbrant: Looks good to me, approved jenkins-bot: Verified 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 @@ version1.0-SNAPSHOT/version /parent -groupIdorg.wikimedia/groupId artifactIdwikipedia-it/artifactId version1.0-SNAPSHOT/version packagingapk/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 @@ version1.0-SNAPSHOT/version /parent -groupIdorg.wikimedia/groupId artifactIdwikipedia/artifactId version1.0-SNAPSHOT/version packagingapk/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=−