Mholloway has uploaded a new change for review.
https://gerrit.wikimedia.org/r/261203
Change subject: Fix NPE when navigating from search results
......................................................................
Fix NPE when navigating from search results
This fixes a crash that occurs in the AOSP API 15 emulator when navigating
to any article from a search. Adds null check for contentIssues and
similarTitles menu items.
Change-Id: Ie6a29cfe52d4f7a8c6a097235ed557a0ce90a184
---
M app/src/main/java/org/wikipedia/page/PageFragment.java
1 file changed, 8 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/03/261203/1
diff --git a/app/src/main/java/org/wikipedia/page/PageFragment.java
b/app/src/main/java/org/wikipedia/page/PageFragment.java
index 1c779a9..07737f1 100755
--- a/app/src/main/java/org/wikipedia/page/PageFragment.java
+++ b/app/src/main/java/org/wikipedia/page/PageFragment.java
@@ -905,10 +905,14 @@
private void updateMenuPageInfo(@NonNull Menu menu) {
MenuItem contentIssues = menu.findItem(R.id.menu_page_content_issues);
MenuItem similarTitles = menu.findItem(R.id.menu_page_similar_titles);
- contentIssues.setVisible(pageInfo != null &&
pageInfo.hasContentIssues());
- contentIssues.setEnabled(true);
- similarTitles.setVisible(pageInfo != null &&
pageInfo.hasSimilarTitles());
- similarTitles.setEnabled(true);
+ if (contentIssues != null) {
+ contentIssues.setVisible(pageInfo != null &&
pageInfo.hasContentIssues());
+ contentIssues.setEnabled(true);
+ }
+ if (similarTitles != null) {
+ similarTitles.setVisible(pageInfo != null &&
pageInfo.hasSimilarTitles());
+ similarTitles.setEnabled(true);
+ }
}
private void showContentIssues() {
--
To view, visit https://gerrit.wikimedia.org/r/261203
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie6a29cfe52d4f7a8c6a097235ed557a0ce90a184
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
