Fix possible NPE during conversation load.

pull/1/head
Greyson Parrelli 6 years ago
parent 351b625975
commit 94e8553b73

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

Loading…
Cancel
Save