Merge pull request #1530 from kiwix/feature/macgills/#1528-npe-main-activity

#1528 Null check view
This commit is contained in:
Seán Mac Gillicuddy 2019-09-27 13:11:01 +01:00 committed by GitHub
commit f58e1891bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1661,7 +1661,7 @@ public class MainActivity extends BaseActivity implements WebViewCallback,
toggleActionItemsConfig(); toggleActionItemsConfig();
this.menu = menu; this.menu = menu;
if (tabSwitcherRoot.getVisibility() == View.VISIBLE) { if (tabSwitcherRoot != null && tabSwitcherRoot.getVisibility() == View.VISIBLE) {
menu.findItem(R.id.menu_search).setVisible(false); menu.findItem(R.id.menu_search).setVisible(false);
menu.findItem(R.id.menu_fullscreen).setVisible(false); menu.findItem(R.id.menu_fullscreen).setVisible(false);
menu.findItem(R.id.menu_random_article).setVisible(false); menu.findItem(R.id.menu_random_article).setVisible(false);