Store dummy and null message files in cache

Stephen Paul Weber created 1 year ago

These are command ui images and bob transfers, at the moment

Change summary

src/cheogram/java/com/cheogram/android/BobTransfer.java               |  2 
src/main/java/eu/siacs/conversations/crypto/PgpDecryptionService.java |  2 
src/main/java/eu/siacs/conversations/entities/Conversation.java       |  1 
src/main/java/eu/siacs/conversations/entities/Message.java            |  1 
src/main/java/eu/siacs/conversations/persistance/FileBackend.java     | 37 
5 files changed, 31 insertions(+), 12 deletions(-)

Detailed changes

src/cheogram/java/com/cheogram/android/BobTransfer.java

@@ -112,7 +112,7 @@ public class BobTransfer implements Transferable {
 					try {
 						final byte[] bytes = Base64.decode(data.getContent(), Base64.DEFAULT);
 
-						File file = xmppConnectionService.getFileBackend().getStorageLocation(new ByteArrayInputStream(bytes), fileExtension);
+						File file = xmppConnectionService.getFileBackend().getStorageLocation(null, new ByteArrayInputStream(bytes), fileExtension);
 						file.getParentFile().mkdirs();
 						if (!file.exists() && !file.createNewFile()) {
 							throw new IOException(file.getAbsolutePath());

src/main/java/eu/siacs/conversations/crypto/PgpDecryptionService.java

@@ -196,7 +196,7 @@ public class PgpDecryptionService {
 								Log.d(Config.LOGTAG,"detected original filename during pgp decryption");
 								final String mime = MimeUtils.guessMimeTypeFromExtension(originalExtension);
 								final String filename = outputFile.getName()+"."+originalExtension;
-								final File fixedFile = mXmppConnectionService.getFileBackend().getStorageLocation(filename,mime);
+								final File fixedFile = mXmppConnectionService.getFileBackend().getStorageLocation(message,filename,mime);
 								if (fixedFile.getParentFile().mkdirs()) {
 									Log.d(Config.LOGTAG,"created parent directories for "+fixedFile.getAbsolutePath());
 								}

src/main/java/eu/siacs/conversations/entities/Conversation.java

@@ -3490,6 +3490,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
                     }
                     int size = (int)(xmppConnectionService.getResources().getDisplayMetrics().density * 288);
                     Message dummy = new Message(Conversation.this, url, Message.ENCRYPTION_NONE);
+                    dummy.setStatus(Message.STATUS_DUMMY);
                     dummy.setFileParams(new Message.FileParams(url));
                     httpManager.createNewDownloadConnection(dummy, true, (file) -> {
                         if (file == null) {

src/main/java/eu/siacs/conversations/entities/Message.java

@@ -71,6 +71,7 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
 
     public static final String TABLENAME = "messages";
 
+    public static final int STATUS_DUMMY = -1;
     public static final int STATUS_RECEIVED = 0;
     public static final int STATUS_UNSEND = 1;
     public static final int STATUS_SEND = 2;

src/main/java/eu/siacs/conversations/persistance/FileBackend.java

@@ -590,14 +590,26 @@ public class FileBackend {
         if (path == null) {
             path = message.getUuid();
         }
-        final DownloadableFile file = getFileForPath(path, message.getMimeType());
+        final var msgFile = getFileForPath(path, message.getMimeType());
+
+        final DownloadableFile file;
         if (encrypted) {
-            return new DownloadableFile(
+            file = new DownloadableFile(
                     mXmppConnectionService.getCacheDir(),
-                    String.format("%s.%s", file.getName(), "pgp"));
+                    String.format("%s.%s", msgFile.getName(), "pgp"));
         } else {
-            return file;
+            file = msgFile;
+        }
+
+        try {
+            if (file.exists() && file.toString().startsWith(mXmppConnectionService.getCacheDir().toString())) {
+                java.nio.file.Files.setAttribute(file.toPath(), "lastAccessTime", java.nio.file.attribute.FileTime.fromMillis(System.currentTimeMillis()));
+            }
+        } catch (final IOException e) {
+            Log.w(Config.LOGTAG, "unable to set lastAccessTime for " + file);
         }
+
+        return file;
     }
 
     public List<Attachment> convertToAttachments(List<DatabaseBackend.FilePath> relativeFilePaths) {
@@ -1026,7 +1038,7 @@ public class FileBackend {
     }
 
     public void setupRelativeFilePath(final Message message, final InputStream is, final String extension) throws IOException, XmppConnectionService.BlockedMediaException {
-        message.setRelativeFilePath(getStorageLocation(is, extension).getAbsolutePath());
+        message.setRelativeFilePath(getStorageLocation(message, is, extension).getAbsolutePath());
     }
 
     public void setupRelativeFilePath(final Message message, final String filename) {
@@ -1035,14 +1047,14 @@ public class FileBackend {
         setupRelativeFilePath(message, filename, mime);
     }
 
-    public File getStorageLocation(final InputStream is, final String extension) throws IOException, XmppConnectionService.BlockedMediaException {
+    public File getStorageLocation(final Message message, final InputStream is, final String extension) throws IOException, XmppConnectionService.BlockedMediaException {
         final String mime = MimeUtils.guessMimeTypeFromExtension(extension);
         Cid[] cids = calculateCids(is);
         String base = cids[0].toString();
 
         File file = null;
         while (file == null || (file.exists() && !file.canRead())) {
-            file = getStorageLocation(String.format("%s.%s", base, extension), mime);
+            file = getStorageLocation(message, String.format("%s.%s", base, extension), mime);
             base += "_";
         }
         for (int i = 0; i < cids.length; i++) {
@@ -1051,7 +1063,7 @@ public class FileBackend {
         return file;
     }
 
-    public File getStorageLocation(final String filename, final String mime) {
+    public File getStorageLocation(final Message message, final String filename, final String mime) {
         final File parentDirectory;
         if (Strings.isNullOrEmpty(mime)) {
             parentDirectory =
@@ -1071,7 +1083,12 @@ public class FileBackend {
         }
         final File appDirectory =
                 new File(parentDirectory, mXmppConnectionService.getString(R.string.app_name));
-        return new File(appDirectory, filename);
+        if (message == null || message.getStatus() == Message.STATUS_DUMMY) {
+            final var mediaCache = new File(mXmppConnectionService.getCacheDir(), "/media");
+            return new File(mediaCache, filename);
+        } else {
+            return new File(appDirectory, filename);
+        }
     }
 
     public static boolean inConversationsDirectory(final Context context, String path) {
@@ -1090,7 +1107,7 @@ public class FileBackend {
 
     public void setupRelativeFilePath(
             final Message message, final String filename, final String mime) {
-        final File file = getStorageLocation(filename, mime);
+        final File file = getStorageLocation(message, filename, mime);
         message.setRelativeFilePath(file.getAbsolutePath());
     }