1 files changed, 10 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
index cca4d5fc2..f45a5ac8e 100644
--- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
+++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
@@ -31,6 +31,7 @@ import android.security.KeyChain;
 import android.support.annotation.BoolRes;
 import android.support.annotation.IntegerRes;
 import android.support.v4.app.RemoteInput;
+import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.util.Log;
@@ -1102,7 +1103,10 @@ public class XmppConnectionService extends Service {
         restoreFromDatabase();
 
         getContentResolver().registerContentObserver(ContactsContract.Contacts.CONTENT_URI, true, contactObserver);
-        new Thread(fileObserver::startWatching).start();
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M || ContextCompat.checkSelfPermission(this, android.Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) {
+            Log.d(Config.LOGTAG, "starting file observer");
+            new Thread(fileObserver::startWatching).start();
+        }
         if (Config.supportOpenPgp()) {
             this.pgpServiceConnection = new OpenPgpServiceConnection(this, "org.sufficientlysecure.keychain", new OpenPgpServiceConnection.OnBound() {
                 @Override
@@ -1161,6 +1165,11 @@ public class XmppConnectionService extends Service {
         CancelAutomaticExport(true);
     }
 
+    public void restartFileObserver() {
+        Log.d(Config.LOGTAG, "restarting file observer");
+        new Thread(fileObserver::restartWatching).start();
+    }
+
     public void toggleScreenEventReceiver() {
         if (awayWhenScreenOff() && !manuallyChangePresence()) {
             final IntentFilter filter = new IntentFilter(Intent.ACTION_SCREEN_ON);