aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart/messenger/ui
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-10-01 08:13:50 +0200
committerChristian Schneppe <christian@pix-art.de>2018-10-01 08:13:50 +0200
commitedfe7465af49580860b6c5950dc9e1b548c46818 (patch)
tree647212ca8d254fde8fd15e1ad52c52632edc834f /src/main/java/de/pixart/messenger/ui
parent36033690b4c6f8b702cd77074cb7a74d0dcde5ca (diff)
catch NPE in configureAttachmentMenu
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui')
-rw-r--r--src/main/java/de/pixart/messenger/ui/util/ConversationMenuConfigurator.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/util/ConversationMenuConfigurator.java b/src/main/java/de/pixart/messenger/ui/util/ConversationMenuConfigurator.java
index edca88f78..dd69b2337 100644
--- a/src/main/java/de/pixart/messenger/ui/util/ConversationMenuConfigurator.java
+++ b/src/main/java/de/pixart/messenger/ui/util/ConversationMenuConfigurator.java
@@ -66,6 +66,9 @@ public class ConversationMenuConfigurator {
}
public static void configureAttachmentMenu(@NonNull Conversation conversation, Menu menu, Boolean Quick_share_attachment_choice, boolean hasAttachments) {
+ if (menu == null) {
+ return;
+ }
final MenuItem menuAttach = menu.findItem(R.id.action_attach_file);
if (Quick_share_attachment_choice && !hasAttachments) {
menuAttach.setVisible(false);