diff options
| author | Christian Schneppe <christian@pix-art.de> | 2017-03-11 18:59:09 +0100 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2017-03-11 20:14:57 +0100 |
| commit | 7ea55c47aa7f787dbd1f753aa848c585de266988 (patch) | |
| tree | 1a60b2bf5d4874e075a530a2fada08f7b856adef /src/main/java/de/pixart/messenger/services | |
| parent | 36d6885162566e2b3041d470b45fac0206334d01 (diff) | |
rename media directories
Diffstat (limited to 'src/main/java/de/pixart/messenger/services')
| -rw-r--r-- | src/main/java/de/pixart/messenger/services/ExportLogsService.java | 4 | ||||
| -rw-r--r-- | src/main/java/de/pixart/messenger/services/XmppConnectionService.java | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/de/pixart/messenger/services/ExportLogsService.java b/src/main/java/de/pixart/messenger/services/ExportLogsService.java index 61d8a921d..ab1d223db 100644 --- a/src/main/java/de/pixart/messenger/services/ExportLogsService.java +++ b/src/main/java/de/pixart/messenger/services/ExportLogsService.java @@ -40,7 +40,7 @@ import de.pixart.messenger.xmpp.jid.Jid; public class ExportLogsService extends Service { private static final SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss"); - private static final String DIRECTORY_STRING_FORMAT = FileBackend.getConversationsDirectory("Chats") + "%s"; + private static final String DIRECTORY_STRING_FORMAT = FileBackend.getConversationsDirectory("Chats", false) + "%s"; private static final String MESSAGE_STRING_FORMAT = "(%s) %s: %s\n"; private static final int NOTIFICATION_ID = 1; private static AtomicBoolean running = new AtomicBoolean(false); @@ -181,7 +181,7 @@ public class ExportLogsService extends Service { // Get hold of the db: FileInputStream InputFile = new FileInputStream(this.getDatabasePath(DatabaseBackend.DATABASE_NAME)); // Set the output folder on the SDcard - File directory = new File(FileBackend.getConversationsDirectory("Database")); + File directory = new File(FileBackend.getConversationsDirectory("Database", false)); // Create the folder if it doesn't exist: if (!directory.exists()) { directory.mkdirs(); diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java index 48c816f03..ce839766d 100644 --- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java +++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java @@ -346,6 +346,7 @@ public class XmppConnectionService extends Service { if (!conversation.startOtrIfNeeded()) { Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": couldn't start OTR with " + conversation.getContact().getJid() + " when needed"); } + checkDeletedFiles(conversation); sendUnsentMessages(conversation); resendFailedFileMessages(conversation); } |