Fixes FS#204: Observe all used directories

- Implementing the FileObserver in a separate class, with mask to watch only deletions not everything
- Add observation of all directories which could contain a sent/received file
- Change observers if the folder names are changed via settings
- markMessage method moved from XmppConnectionService to MessageUtil

1 files changed, 41 insertions, 1 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/persistance/FileBackend.java b/src/main/java/de/thedevstack/conversationsplus/persistance/FileBackend.java
index 5645caf6..9f7e473e 100644
--- a/src/main/java/de/thedevstack/conversationsplus/persistance/FileBackend.java
+++ b/src/main/java/de/thedevstack/conversationsplus/persistance/FileBackend.java
@@ -21,6 +21,7 @@ import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.ConversationsPlusApplication;
 import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
 import de.thedevstack.conversationsplus.exceptions.FileCopyException;
+import de.thedevstack.conversationsplus.persistance.observers.FileDeletionObserver;
 import de.thedevstack.conversationsplus.utils.StreamUtil;
 import de.thedevstack.conversationsplus.Config;
 import de.thedevstack.conversationsplus.R;
@@ -30,8 +31,34 @@ import de.thedevstack.conversationsplus.services.XmppConnectionService;
 
 public class FileBackend {
 	private static final SimpleDateFormat imageDateFormat = new SimpleDateFormat("yyyyMMdd_HHmmssSSS", Locale.US);
+    private static FileBackend INSTANCE;
 
-	public static void createNoMedia() {
+    private FileDeletionObserver privateFilesDirectoryObserver;
+    private FileDeletionObserver privateFilesImageDirectoryObserver;
+    private FileDeletionObserver conversationsFilesDirectoryObserver;
+    private FileDeletionObserver conversationsImagesDirectoryObserver;
+
+    public static void init() {
+        if (null == INSTANCE) {
+            INSTANCE = new FileBackend();
+        }
+        INSTANCE.initFileObservers();
+        INSTANCE.createNoMedia();
+    }
+
+    private void initFileObservers() {
+        this.privateFilesDirectoryObserver = new FileDeletionObserver(FileBackend.getPrivateFileDirectoryPath());
+        this.privateFilesImageDirectoryObserver = new FileDeletionObserver(FileBackend.getConversationsFileDirectory());
+        this.conversationsFilesDirectoryObserver = new FileDeletionObserver(FileBackend.getConversationsImageDirectory());
+        this.conversationsImagesDirectoryObserver = new FileDeletionObserver(FileBackend.getPrivateImageDirectoryPath());
+
+        this.privateFilesDirectoryObserver.startWatching();
+        this.privateFilesImageDirectoryObserver.startWatching();
+        this.conversationsFilesDirectoryObserver.startWatching();
+        this.conversationsImagesDirectoryObserver.startWatching();
+    }
+
+	private void createNoMedia() {
 		final File nomedia = new File(getConversationsFileDirectory()+".nomedia");
 		if (!nomedia.exists()) {
 			try {
@@ -42,6 +69,19 @@ public class FileBackend {
 		}
 	}
 
+    public static void onFileTransferFolderChanged() {
+        INSTANCE.conversationsFilesDirectoryObserver.stopWatching();
+        INSTANCE.conversationsFilesDirectoryObserver = new FileDeletionObserver(FileBackend.getConversationsFileDirectory());
+        INSTANCE.conversationsFilesDirectoryObserver.startWatching();
+        INSTANCE.createNoMedia();
+    }
+
+    public static void onImageTransferFolderChanged() {
+        INSTANCE.conversationsImagesDirectoryObserver.stopWatching();
+        INSTANCE.conversationsImagesDirectoryObserver = new FileDeletionObserver(FileBackend.getConversationsImageDirectory());
+        INSTANCE.conversationsImagesDirectoryObserver.startWatching();
+    }
+
 	public static void updateMediaScanner(File file, XmppConnectionService xmppConnectionService) {
 		if (file.getAbsolutePath().startsWith(getConversationsImageDirectory())) {
 			Intent intent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE);