Fix possible NPE in conversation menu.

Would occur if someone had previously muted a conversation with themselves.
6 years ago · 5c0e1100ed
parent d0b763c16e
commit 5c0e1100ed
1 changed files with 5 additions and 1 deletions
--- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@ -658,7 +658,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
      if (isSecureText) menu.findItem(R.id.menu_call_secure).setVisible(false);
      else              menu.findItem(R.id.menu_call_insecure).setVisible(false);

-      menu.findItem(R.id.menu_mute_notifications).setVisible(false);
+      MenuItem muteItem = menu.findItem(R.id.menu_mute_notifications);
+
+      if (muteItem != null) {
+        muteItem.setVisible(false);
+      }
    }

    searchViewItem = menu.findItem(R.id.menu_search);