From 73f5a097dd4de8291aad7a312c78719f91bbbef5 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Thu, 12 Apr 2018 21:02:53 +0200
Subject: sync roster to disk after roster push

---
 src/main/java/de/pixart/messenger/ui/ConversationFragment.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
index 2c8d72aa0..109e0fe5f 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
@@ -873,7 +873,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
     }
 
     private void hidePrepareFileToast(final Toast prepareFileToast) {
-        if (prepareFileToast != null) {
+        if (prepareFileToast != null && activity != null) {
             activity.runOnUiThread(prepareFileToast::cancel);
         }
     }
-- 
cgit v1.2.3