diff options
| author | Christian Schneppe <christian@pix-art.de> | 2018-09-24 19:45:05 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2018-09-24 19:45:05 +0200 |
| commit | 3c71297965573ffbd3eb423296790b416dc9ce05 (patch) | |
| tree | e2229cf3e58428cb73f6df3365d472eaa84207d7 /src/main/java/de/pixart/messenger/ui/ConversationFragment.java | |
| parent | fcbd82352dec19c7101613b0965a47f2d184fc1f (diff) | |
catch NPE
Diffstat (limited to '')
| -rw-r--r-- | src/main/java/de/pixart/messenger/ui/ConversationFragment.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java index 94a7871bd..9961e014b 100644 --- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java +++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java @@ -1072,7 +1072,9 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke boolean hasAttachments = mediaPreviewAdapter.hasAttachments(); binding.textinput.setVisibility(hasAttachments ? View.GONE : View.VISIBLE); binding.mediaPreview.setVisibility(hasAttachments ? View.VISIBLE : View.GONE); - ConversationMenuConfigurator.configureAttachmentMenu(conversation, mOptionsMenu, activity.xmppConnectionService.getAttachmentChoicePreference(), hasAttachments); + if (mOptionsMenu != null) { + ConversationMenuConfigurator.configureAttachmentMenu(conversation, mOptionsMenu, activity.xmppConnectionService.getAttachmentChoicePreference(), hasAttachments); + } updateSendButton(); } |