aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-09-12 20:08:56 +0200
committerChristian Schneppe <christian@pix-art.de>2018-09-12 20:08:56 +0200
commit777f6a383ba88a9f6b238e14f2f49c51c2dd38e6 (patch)
treebf065549ac03f32f8ad4a8a5b2491cebdca5874e /src
parent49253de81010d4a7d9d894b4c43185056784191a (diff)
add more logging and fix an error in ExportDatabase
Diffstat (limited to 'src')
-rw-r--r--src/main/java/de/pixart/messenger/services/ExportLogsService.java25
1 files changed, 13 insertions, 12 deletions
diff --git a/src/main/java/de/pixart/messenger/services/ExportLogsService.java b/src/main/java/de/pixart/messenger/services/ExportLogsService.java
index 33725e211..b485fb91d 100644
--- a/src/main/java/de/pixart/messenger/services/ExportLogsService.java
+++ b/src/main/java/de/pixart/messenger/services/ExportLogsService.java
@@ -176,6 +176,7 @@ public class ExportLogsService extends Service {
}
public void ExportDatabase() throws IOException {
+ Log.d(Config.LOGTAG, "ExportLogsService: start creating backup");
Account mAccount = mAccounts.get(0);
String EncryptionKey = null;
// Get hold of the db:
@@ -189,8 +190,9 @@ public class ExportLogsService extends Service {
//Delete old database export file
File temp_db_file = new File(directory + "/database.bak");
if (temp_db_file.exists()) {
- Log.d(Config.LOGTAG, "Delete temp database backup file from " + temp_db_file.toString());
- temp_db_file.delete();
+ Log.d(Config.LOGTAG, "ExportLogsService: Delete temp database backup file from " + temp_db_file.toString());
+ boolean temp_db_file_deleted = temp_db_file.delete();
+ Log.d(Config.LOGTAG, "ExportLogsService: old backup file deleted " + temp_db_file_deleted);
}
// Set the output file stream up:
FileOutputStream OutputFile = new FileOutputStream(directory.getPath() + "/database.db.crypt");
@@ -199,25 +201,24 @@ public class ExportLogsService extends Service {
EncryptionKey = mAccount.getPassword(); //get account password
} else {
SharedPreferences multiaccount_prefs = getApplicationContext().getSharedPreferences(USE_MULTI_ACCOUNTS, Context.MODE_PRIVATE);
- String password = multiaccount_prefs.getString("BackupPW", null);
- if (password == null) {
- Log.d(Config.LOGTAG, "Database exporter: failed to write encryted backup to sdcard because of missing password");
- return;
- }
- EncryptionKey = password; //get previously set backup password
+ EncryptionKey = multiaccount_prefs.getString("BackupPW", null);
+ }
+ if (EncryptionKey == null) {
+ Log.d(Config.LOGTAG, "ExportLogsService: Database exporter: failed to write encryted backup to sdcard because of missing password");
+ return;
}
// encrypt database from the input file to the output file
try {
EncryptDecryptFile.encrypt(InputFile, OutputFile, EncryptionKey);
} catch (NoSuchAlgorithmException | NoSuchPaddingException e) {
- Log.d(Config.LOGTAG, "Database exporter: encryption failed with " + e);
+ Log.d(Config.LOGTAG, "ExportLogsService: Database exporter: encryption failed with " + e);
e.printStackTrace();
} catch (InvalidKeyException e) {
- Log.d(Config.LOGTAG, "Database exporter: encryption failed (invalid key) with " + e);
+ Log.d(Config.LOGTAG, "ExportLogsService: Database exporter: encryption failed (invalid key) with " + e);
e.printStackTrace();
} catch (IOException e) {
- Log.d(Config.LOGTAG, "Database exporter: encryption failed (IO) with " + e);
+ Log.d(Config.LOGTAG, "ExportLogsService: Database exporter: encryption failed (IO) with " + e);
e.printStackTrace();
}
}
@@ -236,6 +237,6 @@ public class ExportLogsService extends Service {
}
public boolean multipleAccounts() {
- return getBooleanPreference("enable_multi_accounts", R.bool.confirm_messages);
+ return getBooleanPreference("enable_multi_accounts", R.bool.enable_multi_accounts);
}
}