aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/xmpp
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2016-06-04 09:56:21 +0200
committerChristian Schneppe <christian@pix-art.de>2016-06-04 09:56:21 +0200
commit398eacc0f022aec869cac003e61ced7215c178fa (patch)
tree69e7d28a0161a3476efc2afd45e83b852c3ca721 /src/main/java/eu/siacs/conversations/xmpp
parent3233ccdb6526895d3796dfe298d5793359cc192a (diff)
add first 4 chars to file names
fixes download of multiple files within the same time becauser prosody doesn't send milliseconds
Diffstat (limited to 'src/main/java/eu/siacs/conversations/xmpp')
-rw-r--r--src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
index 11b07e86f..b3fa7a762 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
@@ -319,7 +319,7 @@ public class JingleConnection implements Transferable {
if (fileNameElement != null) {
String[] filename = fileNameElement.getContent()
.toLowerCase(Locale.US).toLowerCase().split("\\.");
- String filename_new = fileDateFormat.format(new Date(message.getTimeSent()));
+ String filename_new = fileDateFormat.format(new Date(message.getTimeSent()))+"_"+message.getUuid().substring(0,4);
String extension = filename[filename.length - 1];
if (VALID_IMAGE_EXTENSIONS.contains(extension)) {
message.setType(Message.TYPE_IMAGE);