diff options
Diffstat (limited to 'src/main/java/de')
| -rw-r--r-- | src/main/java/de/pixart/messenger/http/HttpDownloadConnection.java | 3 | ||||
| -rw-r--r-- | src/main/java/de/pixart/messenger/persistance/FileBackend.java | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/de/pixart/messenger/http/HttpDownloadConnection.java b/src/main/java/de/pixart/messenger/http/HttpDownloadConnection.java index 9985cf929..d2e6135a0 100644 --- a/src/main/java/de/pixart/messenger/http/HttpDownloadConnection.java +++ b/src/main/java/de/pixart/messenger/http/HttpDownloadConnection.java @@ -94,8 +94,7 @@ public class HttpDownloadConnection implements Transferable { } else { extension = lastPart; } - String filename = fileDateFormat.format(new Date(message.getTimeSent())) + "_" + message.getUuid().substring(0, 4); - message.setRelativeFilePath(filename + (extension != null ? ("." + extension) : "")); + message.setRelativeFilePath(fileDateFormat.format(new Date(message.getTimeSent())) + "_" + message.getUuid().substring(0, 4) + (extension != null ? ("." + extension) : "")); this.file = mXmppConnectionService.getFileBackend().getFile(message, false); final String reference = mUrl.getRef(); if (reference != null && AesGcmURLStreamHandler.IV_KEY.matcher(reference).matches()) { diff --git a/src/main/java/de/pixart/messenger/persistance/FileBackend.java b/src/main/java/de/pixart/messenger/persistance/FileBackend.java index 9c904ccd7..044cc0188 100644 --- a/src/main/java/de/pixart/messenger/persistance/FileBackend.java +++ b/src/main/java/de/pixart/messenger/persistance/FileBackend.java @@ -147,7 +147,7 @@ public class FileBackend { || message.getEncryption() == Message.ENCRYPTION_DECRYPTED); String path = message.getRelativeFilePath(); if (path == null) { - path = message.getUuid(); + path = fileDateFormat.format(new Date(message.getTimeSent())) + "_" + message.getUuid().substring(0, 4); } final DownloadableFile file = getFileForPath(path, message.getMimeType()); if (encrypted) { |