From f5f9075da2c22f899a91c092965270e0f31dac52 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Thu, 30 Jul 2020 12:55:19 +0200 Subject: [PATCH] FileObserver: start monitoring new directories when they are created --- .../services/XmppConnectionService.java | 13 ++-- .../utils/ConversationsFileObserver.java | 63 ++++++++++++------- 2 files changed, 45 insertions(+), 31 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java index 812ca3716..8bc43c99f 100644 --- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java @@ -239,8 +239,8 @@ public class XmppConnectionService extends Service { Environment.getExternalStorageDirectory().getAbsolutePath() ) { @Override - public void onEvent(int event, String path) { - markFileDeleted(path); + public void onEvent(final int event, final File file) { + markFileDeleted(file); } }; private final OnMessageAcknowledged mOnMessageAcknowledgedListener = new OnMessageAcknowledged() { @@ -1859,17 +1859,16 @@ public class XmppConnectionService extends Service { return this.conversations; } - private void markFileDeleted(final String path) { + private void markFileDeleted(final File file) { synchronized (FILENAMES_TO_IGNORE_DELETION) { - if (FILENAMES_TO_IGNORE_DELETION.remove(path)) { - Log.d(Config.LOGTAG, "ignored deletion of " + path); + if (FILENAMES_TO_IGNORE_DELETION.remove(file.getAbsolutePath())) { + Log.d(Config.LOGTAG, "ignored deletion of " + file.getAbsolutePath()); return; } } - final File file = new File(path); final boolean isInternalFile = fileBackend.isInternalFile(file); final List uuids = databaseBackend.markFileAsDeleted(file, isInternalFile); - Log.d(Config.LOGTAG, "deleted file " + path + " internal=" + isInternalFile + ", database hits=" + uuids.size()); + Log.d(Config.LOGTAG, "deleted file " + file.getAbsolutePath() + " internal=" + isInternalFile + ", database hits=" + uuids.size()); markUuidsAsDeletedFiles(uuids); } diff --git a/src/main/java/eu/siacs/conversations/utils/ConversationsFileObserver.java b/src/main/java/eu/siacs/conversations/utils/ConversationsFileObserver.java index 00da3d022..8bf36ea1f 100644 --- a/src/main/java/eu/siacs/conversations/utils/ConversationsFileObserver.java +++ b/src/main/java/eu/siacs/conversations/utils/ConversationsFileObserver.java @@ -6,8 +6,11 @@ import android.util.Log; import java.io.File; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.Stack; +import java.util.concurrent.Executor; +import java.util.concurrent.Executors; import java.util.concurrent.atomic.AtomicBoolean; import eu.siacs.conversations.Config; @@ -19,6 +22,9 @@ import eu.siacs.conversations.Config; */ public abstract class ConversationsFileObserver { + private static final Executor EVENT_EXECUTOR = Executors.newSingleThreadExecutor(); + private static final int MASK = FileObserver.DELETE | FileObserver.MOVED_FROM | FileObserver.CREATE; + private final String path; private final List mObservers = new ArrayList<>(); @@ -34,50 +40,47 @@ public abstract class ConversationsFileObserver { } private synchronized void startWatchingInternal() { - Stack stack = new Stack<>(); + final Stack stack = new Stack<>(); stack.push(path); while (!stack.empty()) { if (shouldStop.get()) { - Log.d(Config.LOGTAG,"file observer received command to stop"); + Log.d(Config.LOGTAG, "file observer received command to stop"); return; } - String parent = stack.pop(); - mObservers.add(new SingleFileObserver(parent, FileObserver.DELETE| FileObserver.MOVED_FROM)); + final String parent = stack.pop(); final File path = new File(parent); + mObservers.add(new SingleFileObserver(path, MASK)); final File[] files = path.listFiles(); - if (files == null) { - continue; - } - for(File file : files) { + for (final File file : (files == null ? new File[0] : files)) { if (shouldStop.get()) { - Log.d(Config.LOGTAG,"file observer received command to stop"); + Log.d(Config.LOGTAG, "file observer received command to stop"); return; } if (file.isDirectory() && file.getName().charAt(0) != '.') { final String currentPath = file.getAbsolutePath(); - if (depth(file) <= 8 && !stack.contains(currentPath) && !observing(currentPath)) { + if (depth(file) <= 8 && !stack.contains(currentPath) && !observing(file)) { stack.push(currentPath); } } } } - for(FileObserver observer : mObservers) { + for (FileObserver observer : mObservers) { observer.startWatching(); } } private static int depth(File file) { int depth = 0; - while((file = file.getParentFile()) != null) { + while ((file = file.getParentFile()) != null) { depth++; } return depth; } - private boolean observing(String path) { - for(SingleFileObserver observer : mObservers) { - if(path.equals(observer.path)) { + private boolean observing(final File path) { + for (final SingleFileObserver observer : mObservers) { + if (path.equals(observer.path)) { return true; } } @@ -90,13 +93,13 @@ public abstract class ConversationsFileObserver { } private synchronized void stopWatchingInternal() { - for(FileObserver observer : mObservers) { + for (FileObserver observer : mObservers) { observer.stopWatching(); } mObservers.clear(); } - abstract public void onEvent(int event, String path); + abstract public void onEvent(final int event, File path); public void restartWatching() { stopWatching(); @@ -104,21 +107,33 @@ public abstract class ConversationsFileObserver { } private class SingleFileObserver extends FileObserver { - private final String path; + private final File path; - SingleFileObserver(String path, int mask) { - super(path, mask); + SingleFileObserver(final File path, final int mask) { + super(path.getAbsolutePath(), mask); this.path = path; } @Override - public void onEvent(int event, String filename) { + public void onEvent(final int event, final String filename) { if (filename == null) { - Log.d(Config.LOGTAG,"ignored file event with NULL filename (event="+event+")"); + Log.d(Config.LOGTAG, "ignored file event with NULL filename (event=" + event + ")"); return; } - ConversationsFileObserver.this.onEvent(event, path+'/'+filename); + EVENT_EXECUTOR.execute(() -> { + final File file = new File(this.path, filename); + if ((event & FileObserver.ALL_EVENTS) == FileObserver.CREATE) { + if (file.isDirectory()) { + Log.d(Config.LOGTAG, "file observer observed new directory creation " + file); + if (!observing(file)) { + final SingleFileObserver observer = new SingleFileObserver(file, MASK); + observer.startWatching(); + } + } + return; + } + ConversationsFileObserver.this.onEvent(event, file); + }); } - } }