Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase

Conflicts:
	src/main/java/de/thedevstack/conversationsplus/ConversationsPlusApplication.java
	src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java
	src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java
	src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
	src/main/java/eu/siacs/conversations/ui/SettingsActivity.java

1 files changed, 5 insertions, 5 deletions

diff --git a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
index 5b1978c4..30f71229 100644
--- a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
+++ b/src/main/java/eu/siacs/conversations/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;
@@ -27,12 +24,13 @@ import java.util.Locale;
 
 import de.duenndns.ssl.MemorizingTrustManager;
 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;
 
 public class SettingsActivity extends XmppActivity implements
@@ -187,7 +185,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();
 		}
 
 	}