rename media directories

4 files changed, 8 insertions, 8 deletions

diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
index 069708b26..47d3ea2c5 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
@@ -681,7 +681,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
             if (treatAsFile) {
                 String path = m.getRelativeFilePath();
                 Log.d(Config.LOGTAG, "Path = " + path);
-                if (path == null || !path.startsWith("/") || path.contains(FileBackend.getConversationsDirectory("null"))) {
+                if (path == null || !path.startsWith("/") || path.contains(FileBackend.getConversationsDirectory("null", false))) {
                     deleteFile.setVisible(true);
                     deleteFile.setTitle(activity.getString(R.string.delete_x_file, UIHelper.getFileDescriptionString(activity, m)));
                 }
diff --git a/src/main/java/de/pixart/messenger/ui/RecordingActivity.java b/src/main/java/de/pixart/messenger/ui/RecordingActivity.java
index dab401309..29fcf6a5b 100644
--- a/src/main/java/de/pixart/messenger/ui/RecordingActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/RecordingActivity.java
@@ -120,7 +120,7 @@ public class RecordingActivity extends Activity implements View.OnClickListener
 
     private File getOutputFile() {
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd_HHmmssSSS", Locale.US);
-        return new File(FileBackend.getConversationsDirectory("Audios") + "/"
+        return new File(FileBackend.getConversationsDirectory("Audios", true) + "/"
                 + dateFormat.format(new Date())
                 + ".m4a");
     }
diff --git a/src/main/java/de/pixart/messenger/ui/UpdaterActivity.java b/src/main/java/de/pixart/messenger/ui/UpdaterActivity.java
index 066a2fd39..b043c3db7 100644
--- a/src/main/java/de/pixart/messenger/ui/UpdaterActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/UpdaterActivity.java
@@ -52,7 +52,7 @@ public class UpdaterActivity extends Activity {
             //check if the broadcast message is for our Enqueued download
             long referenceId = intent.getExtras().getLong(DownloadManager.EXTRA_DOWNLOAD_ID);
             if (downloadReference == referenceId) {
-                File file = new File(FileBackend.getConversationsDirectory("Update"), FileName);
+                File file = new File(FileBackend.getConversationsDirectory("Update", false), FileName);
                 //start the installation of the latest localVersion
                 Intent installIntent = new Intent(Intent.ACTION_INSTALL_PACKAGE);
                 installIntent.setDataAndType(FileBackend.getUriForFile(UpdaterActivity.this, file), "application/vnd.android.package-archive");
@@ -267,7 +267,7 @@ public class UpdaterActivity extends Activity {
                         //check if we need to upgrade?
                         if (checkVersion(remoteVersion, localVersion) >= 1) {
                             //delete old downloaded localVersion files
-                            File dir = new File(FileBackend.getConversationsDirectory("Update"));
+                            File dir = new File(FileBackend.getConversationsDirectory("Update", false));
                             if (dir.isDirectory()) {
                                 String[] children = dir.list();
                                 for (String aChildren : children) {
@@ -296,7 +296,7 @@ public class UpdaterActivity extends Activity {
                                                 Uri Download_Uri = Uri.parse(appURI);
                                                 DownloadManager.Request request = new DownloadManager.Request(Download_Uri);
                                                 request.setTitle("Pix-Art Messenger Update");
-                                                request.setDestinationInExternalPublicDir(FileBackend.getDirectoryName("Update"), FileName);
+                                                request.setDestinationInExternalPublicDir(FileBackend.getDirectoryName("Update", false), FileName);
                                                 downloadReference = downloadManager.enqueue(request);
                                                 Toast.makeText(getApplicationContext(),
                                                         getText(R.string.download_started),
diff --git a/src/main/java/de/pixart/messenger/ui/WelcomeActivity.java b/src/main/java/de/pixart/messenger/ui/WelcomeActivity.java
index 0c37515cd..da5972666 100644
--- a/src/main/java/de/pixart/messenger/ui/WelcomeActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/WelcomeActivity.java
@@ -175,7 +175,7 @@ public class WelcomeActivity extends XmppActivity {
 
     private boolean BackupAvailable() {
         // Set the folder on the SDcard
-        File filePath = new File(FileBackend.getConversationsDirectory("Database") + "database.db.crypt");
+        File filePath = new File(FileBackend.getConversationsDirectory("Database", false) + "database.db.crypt");
         Log.d(Config.LOGTAG, "DB Path: " + filePath.toString());
         if (filePath.exists()) {
             Log.d(Config.LOGTAG, "DB Path existing");
@@ -188,7 +188,7 @@ public class WelcomeActivity extends XmppActivity {
 
     private void checkDatabase(String DecryptionKey) throws IOException {
         // Set the folder on the SDcard
-        File directory = new File(FileBackend.getConversationsDirectory("Database"));
+        File directory = new File(FileBackend.getConversationsDirectory("Database", false));
         // Set the input file stream up:
         FileInputStream InputFile = new FileInputStream(directory.getPath() + "/database.db.crypt");
         // Temp output for DB checks
@@ -252,7 +252,7 @@ public class WelcomeActivity extends XmppActivity {
         // Set location for the db:
         final OutputStream OutputFile = new FileOutputStream(this.getDatabasePath(DatabaseBackend.DATABASE_NAME));
         // Set the folder on the SDcard
-        File directory = new File(FileBackend.getConversationsDirectory("Database"));
+        File directory = new File(FileBackend.getConversationsDirectory("Database", false));
         // Set the input file stream up:
         final InputStream InputFile = new FileInputStream(directory.getPath() + "/database.bak");
         //set temp file