mirror/monocles_chat_clean
1
0
Fork 1
Code Activity

Revert "Update filename handling: received files will not get renamed at all, sent file names will only be renamed if not sent as original"

Browse source 
This reverts commit c9ce005a11.
This commit is contained in:
Arne 2023-10-05 09:40:08 +02:00
parent 8e38e775f6
commit e5ebce623a
2 changed files with 22 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
View file

@ -10,7 +10,6 @@ import com.google.common.base.Strings;
import com.google.common.io.ByteStreams;
import com.google.common.primitives.Longs;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
@ -18,11 +17,9 @@ import java.io.OutputStream;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;
import java.util.regex.Pattern;
import javax.net.ssl.SSLHandshakeException;
import eu.siacs.conversations.services.AttachFileToConversationRunnable;
import eu.siacs.conversations.utils.Consumer;
import eu.siacs.conversations.Config;
import eu.siacs.conversations.R;
@ -108,11 +105,10 @@ public class HttpDownloadConnection implements Transferable {
ext = MimeUtils.guessExtensionFromMimeType(fileParams.getMediaType());
}
if (ext != null) {
String filename = getFilenameFromUrl(mUrl.encodedPath());
if (message.getStatus() == Message.STATUS_RECEIVED) {
message.setRelativeFilePath(filename);
message.setRelativeFilePath(String.format("%s.%s", fileDateFormat.format(new Date(message.getTimeSent())) + "_" + message.getUuid().substring(0, 4), ext));
} else {
message.setRelativeFilePath("Sent/" + filename);
message.setRelativeFilePath("Sent/" + String.format("%s.%s", fileDateFormat.format(new Date(message.getTimeSent())) + "_" + message.getUuid().substring(0, 4), ext));
}
} else if (Strings.isNullOrEmpty(message.getRelativeFilePath())) {
if (message.getStatus() == Message.STATUS_RECEIVED) {
@ -148,11 +144,6 @@ public class HttpDownloadConnection implements Transferable {
}
}
private String getFilenameFromUrl(String url) {
final int pos = url.lastIndexOf('/');
return url.substring(pos + 1).toLowerCase();
}
private void setupFile() {
final String reference = mUrl.fragment();
if (reference != null && AesGcmURL.IV_KEY.matcher(reference).matches()) {
@ -190,35 +181,12 @@ public class HttpDownloadConnection implements Transferable {
}
private void decryptFile() throws IOException {
DownloadableFile outputFile = mXmppConnectionService.getFileBackend().getFile(message, true);
final DownloadableFile outputFile = mXmppConnectionService.getFileBackend().getFile(message, true);
if (outputFile.getParentFile().mkdirs()) {
Log.d(Config.LOGTAG, "created parent directories for " + outputFile.getAbsolutePath());
}
// Do not overwrite existing file! Instead append the four digit uuid part in front of the extension
if(outputFile.exists()){
String filename;
// find extension. If there is none, just append the 4byte uuid string
String[] tokens = outputFile.getName().toString().split(Pattern.quote("."));
// if not found, tokens contains the original file at index 0 and the length of tokens is 1
if(tokens.length == 1) {
// so... there is no extension and we append the uuid part directly
filename = String.format("%s_%s", tokens[0], message.getUuid().substring(0, 4));
} else {
if(tokens.length == 2 && tokens[0].length() == 0) {
// well.. we have a .dot file! And we will remove the dot ;)
filename = String.format("%s_%s", tokens[1], message.getUuid().substring(0, 4));
} else {
filename = String.format("%s_%s.%s", tokens[0], message.getUuid().substring(0, 4), tokens[tokens.length-1]);
}
}
// now that we have a new filename we create a new outputFile object
String path = outputFile.getParent();
outputFile = new DownloadableFile(String.format("%s%s%s", path, File.separator, filename));
}
if (!outputFile.createNewFile()) {
Log.w(Config.LOGTAG, "unable to create output file " + outputFile.getAbsolutePath());
}
@ -246,7 +214,23 @@ public class HttpDownloadConnection implements Transferable {
if (message.getEncryption() == Message.ENCRYPTION_PGP) {
notify = message.getConversation().getAccount().getPgpDecryptionService().decrypt(message, notify);
}
DownloadableFile file = mXmppConnectionService.getFileBackend().getFile(message);
DownloadableFile file;
final DownloadableFile tmp = mXmppConnectionService.getFileBackend().getFile(message);
final String extension = MimeUtils.extractRelevantExtension(tmp.getName());
try {
mXmppConnectionService.getFileBackend().setupRelativeFilePath(message, new FileInputStream(tmp), extension);
file = mXmppConnectionService.getFileBackend().getFile(message);
boolean didRename = tmp.renameTo(file);
if (!didRename) throw new IOException("rename failed");
} catch (final IOException e) {
Log.w(Config.LOGTAG, "Failed to rename downloaded file: " + e);
file = tmp;
message.setRelativeFilePath(file.getAbsolutePath());
} catch (final XmppConnectionService.BlockedMediaException e) {
file = tmp;
tmp.delete();
message.setDeleted(true);
}
message.setTransferable(null);
if (cb != null) cb.accept(file);
mXmppConnectionService.updateMessage(message);

24
src/main/java/eu/siacs/conversations/persistance/FileBackend.java
View file

@ -454,12 +454,10 @@ public class FileBackend {
!decrypted
&& (message.getEncryption() == Message.ENCRYPTION_PGP
|| message.getEncryption() == Message.ENCRYPTION_DECRYPTED);
String path = message.getRelativeFilePath();
if (path == null) {
path = fileDateFormat.format(new Date(message.getTimeSent())) + "_" + message.getUuid().substring(0, 4);
}
final DownloadableFile file = getFileForPath(path, message.getMimeType());
if (encrypted) {
return new DownloadableFile(
@ -776,8 +774,8 @@ public class FileBackend {
extension = "oga";
}
String fileName = getFileNameFromUri(uri, message, extension);
setupRelativeFilePath(message, fileName, mime);
String filename = String.format("%s.%s", mXmppConnectionService.getFileBackend().getFile(message).getName(), extension);
setupRelativeFilePath(message, filename, mime);
copyFileToPrivateStorage(mXmppConnectionService.getFileBackend().getFile(message), uri);
final String name = getDisplayNameFromUri(uri);
if (name != null) {
@ -785,24 +783,6 @@ public class FileBackend {
}
}
/***
* Return the filename from an URI object
* @param uri The URI object
* @param m The Message as a fallback
* @param ext The filextension as a fallback
* @return The complete filename (only the filename) with extension
*/
private String getFileNameFromUri(Uri uri, Message m, String ext) {
Cursor cursor = mXmppConnectionService.getContentResolver().query(uri, null, null, null, null);
cursor.moveToFirst();
int i = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME);
String fileName = cursor.getString(i);
if(fileName == null || fileName.length() == 0) {
fileName = String.format("%s.%s", mXmppConnectionService.getFileBackend().getFile(m).getName(), ext);
}
return fileName;
}
private String getDisplayNameFromUri(final Uri uri) {
final String[] projection = {OpenableColumns.DISPLAY_NAME};
String filename = null;