From b789ace386ef3cfe6e0c3834b2a425813f702f43 Mon Sep 17 00:00:00 2001 From: steckbrief Date: Sat, 23 Apr 2016 22:50:54 +0200 Subject: 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 --- .../de/thedevstack/conversationsplus/ui/SettingsActivity.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java') diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java index 35816cff..84eb7016 100644 --- a/src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java @@ -9,13 +9,10 @@ import android.content.SharedPreferences.OnSharedPreferenceChangeListener; import android.content.pm.PackageManager; import android.os.Build; import android.os.Bundle; -import android.preference.CheckBoxPreference; import android.preference.ListPreference; import android.preference.Preference; import android.preference.PreferenceCategory; import android.preference.PreferenceManager; -import android.preference.PreferenceScreen; -import android.util.Log; import android.widget.Toast; import java.security.KeyStoreException; @@ -31,7 +28,6 @@ import de.tzur.conversations.Settings; import de.thedevstack.conversationsplus.R; import de.thedevstack.conversationsplus.entities.Account; import de.thedevstack.conversationsplus.persistance.FileBackend; -import de.thedevstack.conversationsplus.services.ExportLogsService; import de.thedevstack.conversationsplus.xmpp.XmppConnection; import github.ankushsachdeva.emojicon.EmojiconHandler; @@ -187,7 +183,9 @@ public class SettingsActivity extends XmppActivity implements } else if ("parse_emoticons".equals(name)) { EmojiconHandler.setParseEmoticons(Settings.PARSE_EMOTICONS); } else if ("file_transfer_folder".equals(name)) { - FileBackend.createNoMedia(); + FileBackend.onFileTransferFolderChanged(); + } else if ("img_transfer_folder".equals(name)) { + FileBackend.onImageTransferFolderChanged(); } } -- cgit v1.2.3