Fixed cleanup external drafts

app/src/main/java/eu/faircode/email/EntityAttachment.java

@@ -150,14 +150,7 @@ public class EntityAttachment {
     }
 
     static File getFile(Context context, long id, String name) {
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+        File dir = new File(getRoot(context), "attachments");
-        boolean external_storage = prefs.getBoolean("external_storage", false);
-
-        File root = (external_storage
-                ? context.getExternalFilesDir(null)
-                : context.getFilesDir());
-
-        File dir = new File(root, "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);
 

app/src/main/java/eu/faircode/email/WorkerCleanup.java

@@ -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)