From ed244ed74bc611ffbb3fcc052338333ac603a5f4 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Sat, 8 Jun 2019 14:18:47 +0200
Subject: fixed some NPE

---
 src/main/java/de/pixart/messenger/ui/ConversationFragment.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

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

diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
index f0ea6113b..ae0b1781e 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
@@ -2863,9 +2863,12 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
         if (status == Account.State.ONLINE && conversation.setOutgoingChatState(Config.DEFAULT_CHATSTATE)) {
             service.sendChatState(conversation);
         }
-        if (storeNextMessage()) {
-            runOnUiThread(() -> activity.onConversationsListItemUpdated());
-        }
+        runOnUiThread(() -> {
+            if (activity == null) {
+                return;
+            }
+            activity.onConversationsListItemUpdated();
+        });
         runOnUiThread(this::updateSendButton);
     }
 
-- 
cgit v1.2.3