aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
diff options
context:
space:
mode:
authorlookshe <github@lookshe.org>2016-03-25 20:04:37 +0100
committerlookshe <github@lookshe.org>2016-03-25 20:04:37 +0100
commit27c16b4b9acaad33b36145d63f6bfd7e04a3b3f1 (patch)
tree20740102fb6502dd6b130f51054a681275f44431 /src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
parent86d16b030b46aca24e6fab38e5d34beb503a6dc7 (diff)
parent46be514b4db1cb8c17037ac6cd307078e4794a12 (diff)
FS#169 - Merge Conversations 1.11.2 into Conversations+ dev
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/SettingsActivity.java')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/SettingsActivity.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
index c0bd162e..5b1978c4 100644
--- a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
@@ -30,6 +30,7 @@ import de.tzur.conversations.Settings;
import eu.siacs.conversations.Config;
import eu.siacs.conversations.R;
import eu.siacs.conversations.entities.Account;
+import eu.siacs.conversations.persistance.FileBackend;
import eu.siacs.conversations.services.ExportLogsService;
import eu.siacs.conversations.xmpp.XmppConnection;
import github.ankushsachdeva.emojicon.EmojiconHandler;
@@ -185,7 +186,9 @@ public class SettingsActivity extends XmppActivity implements
reconnectAccounts();
} else if ("parse_emoticons".equals(name)) {
EmojiconHandler.setParseEmoticons(Settings.PARSE_EMOTICONS);
- }
+ } else if ("file_transfer_folder".equals(name)) {
+ FileBackend.createNoMedia();
+ }
}