aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart/messenger/ui/WelcomeActivity.java
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-09-26 20:27:33 +0200
committerChristian Schneppe <christian@pix-art.de>2018-09-26 20:27:33 +0200
commitb2a122ec71c8c2af58ea6d99806d07d76efcb0f4 (patch)
tree5cb02e46240aaa316bbfa5d6d73d4ab1f7c7053a /src/main/java/de/pixart/messenger/ui/WelcomeActivity.java
parent3c71297965573ffbd3eb423296790b416dc9ce05 (diff)
show conversation media in contact/conference details
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui/WelcomeActivity.java')
-rw-r--r--src/main/java/de/pixart/messenger/ui/WelcomeActivity.java14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/WelcomeActivity.java b/src/main/java/de/pixart/messenger/ui/WelcomeActivity.java
index 9d5b76c1c..e2bf9d8e9 100644
--- a/src/main/java/de/pixart/messenger/ui/WelcomeActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/WelcomeActivity.java
@@ -193,7 +193,7 @@ public class WelcomeActivity extends XmppActivity {
private boolean BackupAvailable() {
// Set the folder on the SDcard
- File filePath = new File(FileBackend.getConversationsDirectory("Database", false) + "database.db.crypt");
+ File filePath = new File(FileBackend.getBackupDirectory() + "database.db.crypt");
Log.d(Config.LOGTAG, "DB Path: " + filePath.toString());
if (filePath.exists()) {
Log.d(Config.LOGTAG, "DB Path existing");
@@ -206,11 +206,11 @@ 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", false));
+ File directory = new File(FileBackend.getBackupDirectory());
// Set the input file stream up:
- FileInputStream InputFile = new FileInputStream(directory.getPath() + "/database.db.crypt");
+ FileInputStream InputFile = new FileInputStream(directory.getPath() + "database.db.crypt");
// Temp output for DB checks
- File TempFile = new File(directory.getPath() + "/database.bak");
+ File TempFile = new File(directory.getPath() + "database.bak");
FileOutputStream OutputTemp = new FileOutputStream(TempFile);
try {
@@ -286,11 +286,11 @@ 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", false));
+ File directory = new File(FileBackend.getBackupDirectory());
// Set the input file stream up:
- final InputStream InputFile = new FileInputStream(directory.getPath() + "/database.bak");
+ final InputStream InputFile = new FileInputStream(directory.getPath() + "database.bak");
//set temp file
- File TempFile = new File(directory.getPath() + "/database.bak");
+ File TempFile = new File(directory.getPath() + "database.bak");
// Transfer bytes from the input file to the output file
byte[] buffer = new byte[1024];