jenkins-bot has submitted this change and it was merged. Change subject: Prevent possible NPE when preparing options menu. ......................................................................
Prevent possible NPE when preparing options menu. https://rink.hockeyapp.net/manage/apps/226650/app_versions/11/crash_reasons/110289892 Change-Id: Ib5c88595bd8c2d9a6a38ad909ed438f3aa47bb23 --- M app/src/main/java/org/wikipedia/page/PageFragment.java 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: Sniedzielski: Looks good to me, approved jenkins-bot: Verified diff --git a/app/src/main/java/org/wikipedia/page/PageFragment.java b/app/src/main/java/org/wikipedia/page/PageFragment.java index d6b3abf..0571bba 100755 --- a/app/src/main/java/org/wikipedia/page/PageFragment.java +++ b/app/src/main/java/org/wikipedia/page/PageFragment.java @@ -643,6 +643,14 @@ MenuItem similarTitles = menu.findItem(R.id.menu_page_similar_titles); MenuItem themeChooserItem = menu.findItem(R.id.menu_page_font_and_theme); + if (otherLangItem == null) { + // On API <= 19, it looks like onPrepareOptionsMenu can be called before the menu + // is actually inflated. + // TODO: remove when this is better understood. + L.logRemoteErrorIfProd(new RuntimeException("onPrepareOptionsMenu called with empty menu.")); + return; + } + if (pageLoadStrategy.isLoading() || errorState) { otherLangItem.setEnabled(false); findInPageItem.setEnabled(false); -- To view, visit https://gerrit.wikimedia.org/r/269163 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib5c88595bd8c2d9a6a38ad909ed438f3aa47bb23 Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Dbrant <[email protected]> Gerrit-Reviewer: BearND <[email protected]> Gerrit-Reviewer: Brion VIBBER <[email protected]> Gerrit-Reviewer: Mholloway <[email protected]> Gerrit-Reviewer: Niedzielski <[email protected]> Gerrit-Reviewer: Sniedzielski <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
