From 526d510423314bcabbaadcd32950928b68d674b2 Mon Sep 17 00:00:00 2001 From: Moxie Marlinspike Date: Thu, 6 Jul 2017 12:58:05 -0700 Subject: [PATCH] Start creating "persistent" blobs in cache directory Helps #5515 // FREEBIE --- .../securesms/providers/PersistentBlobProvider.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/org/thoughtcrime/securesms/providers/PersistentBlobProvider.java b/src/org/thoughtcrime/securesms/providers/PersistentBlobProvider.java index 931b7d3f68..9707f423d9 100644 --- a/src/org/thoughtcrime/securesms/providers/PersistentBlobProvider.java +++ b/src/org/thoughtcrime/securesms/providers/PersistentBlobProvider.java @@ -151,9 +151,21 @@ public class PersistentBlobProvider { } private File getFile(long id) { + File legacy = getLegacyFile(id); + File cache = getCacheFile(id); + + if (legacy.exists()) return legacy; + else return cache; + } + + private File getLegacyFile(long id) { return new File(context.getDir("captures", Context.MODE_PRIVATE), id + "." + BLOB_EXTENSION); } + private File getCacheFile(long id) { + return new File(context.getCacheDir(), "capture-" + id + "." + BLOB_EXTENSION); + } + private @Nullable String getEncryptedFileName(@NonNull MasterSecret masterSecret, @Nullable String fileName) { if (fileName == null) return null; return new MasterCipher(masterSecret).encryptBody(fileName);