From 1ef838b9666e24c04cbb574a36deb2f5de18d0b5 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Thu, 4 Dec 2014 06:56:52 +0000
Subject: [PATCH] Fixed NPE
---
.../android/router/addressbook/AddressbookFragment.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/net/i2p/android/router/addressbook/AddressbookFragment.java b/app/src/main/java/net/i2p/android/router/addressbook/AddressbookFragment.java
index d1c81fe60..cd7b9d04f 100644
--- a/app/src/main/java/net/i2p/android/router/addressbook/AddressbookFragment.java
+++ b/app/src/main/java/net/i2p/android/router/addressbook/AddressbookFragment.java
@@ -173,15 +173,19 @@ public class AddressbookFragment extends ListFragment implements
inflater.inflate(R.menu.fragment_addressbook_actions, menu);
mSearchAddressbook = menu.findItem(R.id.action_search_addressbook);
+ }
+ @Override
+ public void onPrepareOptionsMenu(Menu menu) {
// Hide until needed
if (getRouterContext() == null) {
mSearchAddressbook.setVisible(false);
- mAddToAddressbook.setVisibility(View.GONE);
+ if (mAddToAddressbook != null)
+ mAddToAddressbook.setVisibility(View.GONE);
}
// Only allow adding to private book
- if (!PRIVATE_BOOK.equals(mBook)) {
+ if (!PRIVATE_BOOK.equals(mBook) && mAddToAddressbook != null) {
mAddToAddressbook.setVisibility(View.GONE);
mAddToAddressbook = null;
}
--
GitLab