[MediaWiki-commits] [Gerrit] Fix FieldHidden warnings & turn off warnings for params - change (apps...wikipedia)

[Brion VIBBER (Code Review)]

Brion VIBBER has submitted this change and it was merged.

Change subject: Fix FieldHidden warnings & turn off warnings for params
......................................................................


Fix FieldHidden warnings & turn off warnings for params

Bug: 63742
Change-Id: I7933dfceb5d3b46bb7b010d3fd9507b708bfc15a
---
M checkstyle.xml
M wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
M wikipedia/src/main/java/org/wikipedia/page/SectionsFetchTask.java
3 files changed, 13 insertions(+), 12 deletions(-)

Approvals:
  Brion VIBBER: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/checkstyle.xml b/checkstyle.xml
index 7f0c9f3..f0b21e4 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -130,6 +130,7 @@
         <module name="EmptyStatement"/>
         <module name="EqualsHashCode"/>
         <module name="HiddenField">
+            <property name="tokens" value="VARIABLE_DEF"/>
             <property name="ignoreSetter" value="true"/>
             <property name="ignoreConstructorParameter" value="true"/>
         </module>
diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java 
b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
index 25b6e0a..58e695b 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
@@ -72,7 +72,7 @@
         return page;
     }
 
-    private void displayLeadSection(Page page) {
+    private void displayLeadSection() {
         JSONObject leadSectionPayload = new JSONObject();
         try {
             leadSectionPayload.put("title", page.getDisplayTitle());
@@ -94,7 +94,7 @@
         Utils.crossFade(loadProgress, webView);
     }
 
-    private void populateNonLeadSections(final Page page) {
+    private void populateNonLeadSections() {
         editHandler = new EditHandler(this, bridge, page);
         bridge.sendMessage("startSectionsDisplay", new JSONObject());
     }
@@ -208,8 +208,8 @@
         }
     }
 
-    private void performActionForState(int state) {
-        switch (state) {
+    private void performActionForState(int forState) {
+        switch (forState) {
             case STATE_NO_FETCH:
                 new LeadSectionFetchTask().execute();
                 break;
@@ -217,8 +217,8 @@
                 new RestSectionsFetchTask().execute();
                 break;
             case STATE_COMPLETE_FETCH:
-                displayLeadSection(page);
-                populateNonLeadSections(page);
+                displayLeadSection();
+                populateNonLeadSections();
                 webView.scrollTo(0, scrollY);
                 break;
             default:
@@ -271,7 +271,7 @@
         @Override
         public void onFinish(List<Section> result) {
             page = new Page(title, (ArrayList<Section>) result, 
pageProperties);
-            displayLeadSection(page);
+            displayLeadSection();
             setState(STATE_INITIAL_FETCH);
             new RestSectionsFetchTask().execute();
 
@@ -305,7 +305,7 @@
             ArrayList<Section> newSections = (ArrayList<Section>) 
page.getSections().clone();
             newSections.addAll(result);
             page = new Page(page.getTitle(), newSections, 
page.getPageProperties());
-            populateNonLeadSections(page);
+            populateNonLeadSections();
             setState(STATE_COMPLETE_FETCH);
         }
     }
diff --git a/wikipedia/src/main/java/org/wikipedia/page/SectionsFetchTask.java 
b/wikipedia/src/main/java/org/wikipedia/page/SectionsFetchTask.java
index 2031363..90256a4 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/SectionsFetchTask.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/SectionsFetchTask.java
@@ -9,16 +9,16 @@
 
 public class SectionsFetchTask extends ApiTask<List<Section>> {
     private final PageTitle title;
-    private final String sections;
+    private final String sectionsRequested;
     private final WikipediaApp app;
 
-    public SectionsFetchTask(Context context, PageTitle title, String 
sections) {
+    public SectionsFetchTask(Context context, PageTitle title, String 
sectionsRequested) {
         super(
                 1,
                 
((WikipediaApp)context.getApplicationContext()).getAPIForSite(title.getSite())
         );
         this.title = title;
-        this.sections = sections;
+        this.sectionsRequested = sectionsRequested;
         this.app = (WikipediaApp)context.getApplicationContext();
     }
 
@@ -28,7 +28,7 @@
                 .param("page", title.getPrefixedText())
                 .param("prop", "text|sections")
                 .param("onlyrequestedsections", "1") // Stupid mediawiki & 
stupid backwardscompat
-                .param("sections", sections)
+                .param("sections", sectionsRequested)
                 .param("sectionprop", "toclevel|line|anchor")
                 .param("noheadings", "true");
     }

-- 
To view, visit https://gerrit.wikimedia.org/r/126156
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7933dfceb5d3b46bb7b010d3fd9507b708bfc15a
Gerrit-PatchSet: 2
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