Fixed NPE

This commit is contained in:
str4d
2014-12-04 06:56:52 +00:00
parent c672ca05f5
commit 1ef838b966

View File

@ -173,15 +173,19 @@ public class AddressbookFragment extends ListFragment implements
inflater.inflate(R.menu.fragment_addressbook_actions, menu); inflater.inflate(R.menu.fragment_addressbook_actions, menu);
mSearchAddressbook = menu.findItem(R.id.action_search_addressbook); mSearchAddressbook = menu.findItem(R.id.action_search_addressbook);
}
@Override
public void onPrepareOptionsMenu(Menu menu) {
// Hide until needed // Hide until needed
if (getRouterContext() == null) { if (getRouterContext() == null) {
mSearchAddressbook.setVisible(false); mSearchAddressbook.setVisible(false);
mAddToAddressbook.setVisibility(View.GONE); if (mAddToAddressbook != null)
mAddToAddressbook.setVisibility(View.GONE);
} }
// Only allow adding to private book // Only allow adding to private book
if (!PRIVATE_BOOK.equals(mBook)) { if (!PRIVATE_BOOK.equals(mBook) && mAddToAddressbook != null) {
mAddToAddressbook.setVisibility(View.GONE); mAddToAddressbook.setVisibility(View.GONE);
mAddToAddressbook = null; mAddToAddressbook = null;
} }