Fix possible NPE during conversation load.

This commit is contained in:
Greyson Parrelli 2019-02-15 19:24:23 -08:00
parent 351b625975
commit 94e8553b73

View File

@ -1671,7 +1671,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
updateDefaultSubscriptionId(recipient.getDefaultSubscriptionId());
initializeSecurity(isSecureText, isDefaultSms);
if (!searchViewItem.isActionViewExpanded()) {
if (searchViewItem == null || !searchViewItem.isActionViewExpanded()) {
invalidateOptionsMenu();
}
});