1 files changed, 9 insertions, 2 deletions
diff --git a/src/main/java/de/pixart/messenger/utils/ConversationsFileObserver.java b/src/main/java/de/pixart/messenger/utils/ConversationsFileObserver.java
index 4e275df3f..73d5589e4 100644
--- a/src/main/java/de/pixart/messenger/utils/ConversationsFileObserver.java
+++ b/src/main/java/de/pixart/messenger/utils/ConversationsFileObserver.java
@@ -2,12 +2,15 @@ package de.pixart.messenger.utils;
 
 
 import android.os.FileObserver;
+import android.util.Log;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Stack;
 
+import de.pixart.messenger.Config;
+
 /**
  * Copyright (C) 2012 Bartek Przybylski
  * Copyright (C) 2015 ownCloud Inc.
@@ -19,7 +22,7 @@ public abstract class ConversationsFileObserver {
     private final String path;
     private final List<SingleFileObserver> mObservers = new ArrayList<>();
 
-    public ConversationsFileObserver(String path) {
+    protected ConversationsFileObserver(String path) {
         this.path = path;
     }
 
@@ -88,13 +91,17 @@ public abstract class ConversationsFileObserver {
     private class SingleFileObserver extends FileObserver {
         private final String path;
 
-        public SingleFileObserver(String path, int mask) {
+        SingleFileObserver(String path, int mask) {
             super(path, mask);
             this.path = path;
         }
 
         @Override
         public void onEvent(int event, String filename) {
+            if (filename == null) {
+                Log.d(Config.LOGTAG, "ignored file event with NULL filename (event=" + event + ")");
+                return;
+            }
             ConversationsFileObserver.this.onEvent(event, path + '/' + filename);
         }