[MediaWiki-commits] [Gerrit] Use the new isMainPage() and isFilePage() methods added to t... - change (apps...wikipedia)

2015-06-05 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Use the new isMainPage() and isFilePage() methods added to the 
Page class.
..


Use the new isMainPage() and isFilePage() methods added to the Page class.

Bug: T90843
Change-Id: I0e1d9561e4a1b9b7d50ae37cbc8848abe9a12472
---
M wikipedia/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
M wikipedia/src/main/java/org/wikipedia/page/Page.java
M wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
M wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
M wikipedia/src/main/java/org/wikipedia/page/snippet/ShareHandler.java
5 files changed, 7 insertions(+), 7 deletions(-)

Approvals:
  BearND: Looks good to me, but someone else must approve
  Dbrant: Looks good to me, approved
  jenkins-bot: Verified



diff --git 
a/wikipedia/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java 
b/wikipedia/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
index ecb1412..e4c517e 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
@@ -525,7 +525,7 @@
 leadSectionPayload.put(string_expand_refs, 
activity.getString(R.string.expand_refs));
 leadSectionPayload.put(isBeta, app.getReleaseType() != 
WikipediaApp.RELEASE_PROD);
 leadSectionPayload.put(siteLanguage, 
model.getTitle().getSite().getLanguage());
-leadSectionPayload.put(isMainPage, pageProperties.isMainPage());
+leadSectionPayload.put(isMainPage, page.isMainPage());
 leadSectionPayload.put(apiLevel, Build.VERSION.SDK_INT);
 bridge.sendMessage(displayLeadSection, leadSectionPayload);
 
@@ -538,8 +538,8 @@
 .optBoolean(disableAnonEditing, false)
  !app.getUserInfoStorage().isLoggedIn();
 miscPayload.put(noedit, (isAnonEditingDisabled
-|| model.getTitle().isFilePage()
-|| pageProperties.isMainPage()));
+|| page.isFilePage()
+|| page.isMainPage()));
 miscPayload.put(protect, !pageProperties.canEdit());
 bridge.sendMessage(setPageProtected, miscPayload);
 } catch (JSONException e) {
diff --git a/wikipedia/src/main/java/org/wikipedia/page/Page.java 
b/wikipedia/src/main/java/org/wikipedia/page/Page.java
old mode 100644
new mode 100755
index e56b6e9..561108a
--- a/wikipedia/src/main/java/org/wikipedia/page/Page.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/Page.java
@@ -56,7 +56,7 @@
 }
 
 public boolean couldHaveReadMoreSection() {
-return (!getTitle().isFilePage()  !getTitle().isSpecial()  
getTitle().getNamespace() == null);
+return (!isFilePage()  !getTitle().isSpecial()  
getTitle().getNamespace() == null);
 }
 
 @Override
diff --git a/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java 
b/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
old mode 100644
new mode 100755
index ba0b4e4..6aea805
--- a/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
@@ -213,7 +213,7 @@
 }
 });
 
-if (!page.getPageProperties().isMainPage()  !firstPage) {
+if (!page.isMainPage()  !firstPage) {
 final SharedPreferences prefs = 
PreferenceManager.getDefaultSharedPreferences(parentActivity);
 final boolean knowsToC = 
prefs.getBoolean(PrefKeys.getKnowTocDrawer(), false);
 if (!knowsToC) {
diff --git 
a/wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java 
b/wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
old mode 100644
new mode 100755
index 04e9557..f63c5b3
--- 
a/wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
+++ 
b/wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
@@ -425,7 +425,7 @@
 if (!parentFragment.isAdded()) {
 return;
 }
-boolean isMainPage = 
parentFragment.getPage().getPageProperties().isMainPage();
+boolean isMainPage = parentFragment.getPage().isMainPage();
 int titleContainerHeight;
 int titleBottomPadding = 0;
 
diff --git 
a/wikipedia/src/main/java/org/wikipedia/page/snippet/ShareHandler.java 
b/wikipedia/src/main/java/org/wikipedia/page/snippet/ShareHandler.java
old mode 100644
new mode 100755
index fceb212..25e2b13
--- a/wikipedia/src/main/java/org/wikipedia/page/snippet/ShareHandler.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/snippet/ShareHandler.java
@@ -75,7 +75,7 @@
 curPageFragment.getLeadImageBitmap(),
 curPageFragment.getLeadImageFocusY(),
 title.getDisplayText(),
-

[MediaWiki-commits] [Gerrit] Use the new isMainPage() and isFilePage() methods added to t... - change (apps...wikipedia)

2015-05-16 Thread Kittensofdoom (Code Review) 
Kittensofdoom has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/211496

Change subject: Use the new isMainPage() and isFilePage() methods added to the 
Page class.
..

Use the new isMainPage() and isFilePage() methods added to the Page class.

Bug: T90843
Change-Id: I0e1d9561e4a1b9b7d50ae37cbc8848abe9a12472
---
M wikipedia/src/main/java/org/wikipedia/page/Page.java
M wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
M wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
M wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
M wikipedia/src/main/java/org/wikipedia/page/snippet/ShareHandler.java
5 files changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/96/211496/1

diff --git a/wikipedia/src/main/java/org/wikipedia/page/Page.java 
b/wikipedia/src/main/java/org/wikipedia/page/Page.java
old mode 100644
new mode 100755
index c86130b..26f0085
--- a/wikipedia/src/main/java/org/wikipedia/page/Page.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/Page.java
@@ -57,7 +57,7 @@
 }
 
 public boolean couldHaveReadMoreSection() {
-return (!getTitle().isFilePage()  !getTitle().isSpecial()  
getTitle().getNamespace() == null);
+return (!isFilePage()  !getTitle().isSpecial()  
getTitle().getNamespace() == null);
 }
 
 @Override
diff --git 
a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java 
b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
index 9ab455d..3c01eaf 100755
--- a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
@@ -200,7 +200,7 @@
 leadSectionPayload.put(string_expand_refs, 
getString(R.string.expand_refs));
 leadSectionPayload.put(isBeta, app.getReleaseType() != 
WikipediaApp.RELEASE_PROD);
 leadSectionPayload.put(siteLanguage, 
title.getSite().getLanguage());
-leadSectionPayload.put(isMainPage, 
page.getPageProperties().isMainPage());
+leadSectionPayload.put(isMainPage, page.isMainPage());
 leadSectionPayload.put(apiLevel, Build.VERSION.SDK_INT);
 bridge.sendMessage(displayLeadSection, leadSectionPayload);
 
@@ -214,7 +214,7 @@
  
!app.getUserInfoStorage().isLoggedIn();
 miscPayload.put(noedit, (isAnonEditingDisabled
|| title.isFilePage()
-   || 
page.getPageProperties().isMainPage()));
+   || page.isMainPage()));
 miscPayload.put(protect, !page.getPageProperties().canEdit());
 bridge.sendMessage(setPageProtected, miscPayload);
 } catch (JSONException e) {
diff --git a/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java 
b/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
old mode 100644
new mode 100755
index 39916fe..8ce3fe2
--- a/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
@@ -214,7 +214,7 @@
 }
 });
 
-if (!page.getPageProperties().isMainPage()  !firstPage) {
+if (!page.isMainPage()  !firstPage) {
 final SharedPreferences prefs = 
PreferenceManager.getDefaultSharedPreferences(parentActivity);
 final boolean knowsToC = 
prefs.getBoolean(PrefKeys.getKnowTocDrawer(), false);
 if (!knowsToC) {
diff --git 
a/wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java 
b/wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
old mode 100644
new mode 100755
index 9ad4500..000b5e1
--- 
a/wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
+++ 
b/wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
@@ -425,7 +425,7 @@
 if (!parentFragment.isAdded()) {
 return;
 }
-boolean isMainPage = 
parentFragment.getPage().getPageProperties().isMainPage();
+boolean isMainPage = parentFragment.getPage().isMainPage();
 int titleContainerHeight;
 int titleBottomPadding = 0;
 
diff --git 
a/wikipedia/src/main/java/org/wikipedia/page/snippet/ShareHandler.java 
b/wikipedia/src/main/java/org/wikipedia/page/snippet/ShareHandler.java
old mode 100644
new mode 100755
index cabb127..3c5c0ed
--- a/wikipedia/src/main/java/org/wikipedia/page/snippet/ShareHandler.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/snippet/ShareHandler.java
@@ -75,7 +75,7 @@
 curPageFragment.getLeadImageBitmap(),
 curPageFragment.getLeadImageFocusY(),
 title.getDisplayText(),
-