From edfe7465af49580860b6c5950dc9e1b548c46818 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Mon, 1 Oct 2018 08:13:50 +0200
Subject: catch NPE in configureAttachmentMenu

---
 .../java/de/pixart/messenger/ui/util/ConversationMenuConfigurator.java | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/main/java/de')

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);
-- 
cgit v1.2.3