Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-28 20:06:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed cleanup external drafts

Browse Source
This commit is contained in:
M66B
2022-10-06 14:07:18 +02:00
parent 7df5b2767b
commit bdfb324441
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/eu/faircode/email/EntityAttachment.java
View File

@@ -150,14 +150,7 @@ public class EntityAttachment {
}
static File getFile(Context context, long id, String name) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean external_storage = prefs.getBoolean("external_storage", false);
File root = (external_storage
? context.getExternalFilesDir(null)
: context.getFilesDir());
File dir = new File(root, "attachments");
File dir = new File(getRoot(context), "attachments");
if (!dir.exists())
dir.mkdir();
String filename = Long.toString(id);
@@ -168,6 +161,16 @@ public class EntityAttachment {
return new File(dir, filename);
}
static File getRoot(Context context) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean external_storage = prefs.getBoolean("external_storage", false);
File root = (external_storage
? context.getExternalFilesDir(null)
: context.getFilesDir());
return root;
}
static void copy(Context context, long oldid, long newid) {
DB db = DB.getInstance(context);

2
app/src/main/java/eu/faircode/email/WorkerCleanup.java
View File

@@ -277,7 +277,7 @@ public class WorkerCleanup extends Worker {
// Cleanup attachment files
Log.i("Cleanup attachment files");
File[] attachments = new File(context.getFilesDir(), "attachments").listFiles();
File[] attachments = new File(EntityAttachment.getRoot(context), "attachments").listFiles();
if (attachments != null)
for (File file : attachments)
if (manual || file.lastModified() + KEEP_FILES_DURATION < now)