mirror of https://github.com/M66B/FairEmail.git
Refactoring
This commit is contained in:
parent
e533c07a1f
commit
b78edd89a9
|
@ -178,7 +178,7 @@ public class ContactInfo {
|
|||
// Favicons
|
||||
Log.i("Cleanup avatars");
|
||||
for (String type : new String[]{"favicons", "generated"}) {
|
||||
File[] favicons = new File(context.getFilesDir(), type).listFiles();
|
||||
File[] favicons = Helper.ensureExists(context, type).listFiles();
|
||||
if (favicons != null)
|
||||
for (File file : favicons)
|
||||
if (file.lastModified() + CACHE_FAVICON_DURATION < now) {
|
||||
|
@ -201,7 +201,7 @@ public class ContactInfo {
|
|||
return;
|
||||
|
||||
for (String type : new String[]{"favicons", "generated"}) {
|
||||
final File dir = new File(context.getFilesDir(), type);
|
||||
final File dir = Helper.ensureExists(context, type);
|
||||
Helper.getParallelExecutor().submit(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
|
|
|
@ -1083,7 +1083,7 @@ public abstract class DB extends RoomDatabase {
|
|||
@Override
|
||||
public void migrate(@NonNull SupportSQLiteDatabase db) {
|
||||
logMigration(startVersion, endVersion);
|
||||
File folder = new File(context.getFilesDir(), "attachments");
|
||||
File folder = Helper.ensureExists(context, "attachments");
|
||||
File[] attachments = folder.listFiles();
|
||||
if (attachments != null)
|
||||
for (File source : attachments) {
|
||||
|
@ -1640,7 +1640,7 @@ public abstract class DB extends RoomDatabase {
|
|||
logMigration(startVersion, endVersion);
|
||||
db.execSQL("UPDATE `message` SET raw = NULL");
|
||||
|
||||
File[] raws = new File(context.getFilesDir(), "raw").listFiles();
|
||||
File[] raws = Helper.ensureExists(context, "raw").listFiles();
|
||||
if (raws != null)
|
||||
for (File file : raws)
|
||||
Helper.secureDelete(file);
|
||||
|
|
|
@ -627,7 +627,7 @@ public class EntityMessage implements Serializable {
|
|||
}
|
||||
|
||||
static void convert(Context context) {
|
||||
File root = new File(context.getFilesDir(), "messages");
|
||||
File root = Helper.ensureExists(context, "messages");
|
||||
List<File> files = Helper.listFiles(root);
|
||||
for (File file : files)
|
||||
if (file.isFile())
|
||||
|
|
|
@ -63,7 +63,7 @@ public class FairEmailLoggingProvider extends TinylogLoggingProvider {
|
|||
|
||||
static void setup(Context context) {
|
||||
System.setProperty("tinylog.directory",
|
||||
new File(context.getFilesDir(), "logs").getAbsolutePath());
|
||||
Helper.ensureExists(context, "logs").getAbsolutePath());
|
||||
|
||||
setLevel(context);
|
||||
}
|
||||
|
@ -93,7 +93,7 @@ public class FairEmailLoggingProvider extends TinylogLoggingProvider {
|
|||
}
|
||||
|
||||
static File[] getLogFiles(Context context) {
|
||||
File[] files = new File(context.getFilesDir(), "logs").listFiles();
|
||||
File[] files = Helper.ensureExists(context, "logs").listFiles();
|
||||
|
||||
if (files == null)
|
||||
return new File[0];
|
||||
|
|
|
@ -218,7 +218,7 @@ public class FragmentDialogPrint extends FragmentDialogBase {
|
|||
HtmlHelper.embedInlineImages(context, id, document, true);
|
||||
|
||||
// onPageFinished will not be called if not all images can be loaded
|
||||
File dir = new File(context.getFilesDir(), "images");
|
||||
File dir = Helper.ensureExists(context, "images");
|
||||
List<Future<Void>> futures = new ArrayList<>();
|
||||
Elements imgs = document.select("img");
|
||||
for (int i = 0; i < imgs.size(); i++) {
|
||||
|
|
|
@ -213,7 +213,7 @@ public class WorkerCleanup extends Worker {
|
|||
// Cleanup message files
|
||||
Log.breadcrumb("worker", "cleanup", "message files");
|
||||
{
|
||||
File[] files = new File(context.getFilesDir(), "messages").listFiles();
|
||||
File[] files = Helper.ensureExists(context, "messages").listFiles();
|
||||
if (files != null)
|
||||
for (File file : files) {
|
||||
if (file.isDirectory())
|
||||
|
@ -222,16 +222,16 @@ public class WorkerCleanup extends Worker {
|
|||
cleanupMessageFiles(db, manual, new File[]{file});
|
||||
}
|
||||
}
|
||||
cleanupMessageFiles(db, manual, new File(context.getFilesDir(), "revision").listFiles());
|
||||
cleanupMessageFiles(db, manual, new File(context.getFilesDir(), "references").listFiles());
|
||||
cleanupMessageFiles(db, manual, new File(context.getFilesDir(), "encryption").listFiles());
|
||||
cleanupMessageFiles(db, manual, new File(context.getFilesDir(), "photo").listFiles());
|
||||
cleanupMessageFiles(db, manual, new File(context.getFilesDir(), "calendar").listFiles());
|
||||
cleanupMessageFiles(db, manual, Helper.ensureExists(context, "revision").listFiles());
|
||||
cleanupMessageFiles(db, manual, Helper.ensureExists(context, "references").listFiles());
|
||||
cleanupMessageFiles(db, manual, Helper.ensureExists(context, "encryption").listFiles());
|
||||
cleanupMessageFiles(db, manual, Helper.ensureExists(context, "photo").listFiles());
|
||||
cleanupMessageFiles(db, manual, Helper.ensureExists(context, "calendar").listFiles());
|
||||
|
||||
// Cleanup raw message files
|
||||
if (!download_eml) {
|
||||
Log.breadcrumb("worker", "cleanup", "raw message files");
|
||||
File[] raws = new File(context.getFilesDir(), "raw").listFiles();
|
||||
File[] raws = Helper.ensureExists(context, "raw").listFiles();
|
||||
if (raws != null)
|
||||
for (File file : raws)
|
||||
if (manual || file.lastModified() + KEEP_FILES_DURATION < now)
|
||||
|
@ -278,7 +278,7 @@ public class WorkerCleanup extends Worker {
|
|||
// Cleanup cached images
|
||||
{
|
||||
Log.breadcrumb("worker", "cleanup", "image files");
|
||||
File[] images = new File(context.getFilesDir(), "images").listFiles();
|
||||
File[] images = Helper.ensureExists(context, "images").listFiles();
|
||||
if (images != null)
|
||||
for (File file : images)
|
||||
if (manual || file.lastModified() + KEEP_FILES_DURATION < now)
|
||||
|
@ -299,7 +299,7 @@ public class WorkerCleanup extends Worker {
|
|||
// Cleanup shared files
|
||||
{
|
||||
Log.breadcrumb("worker", "cleanup", "shared files");
|
||||
File[] shared = new File(context.getFilesDir(), "shared").listFiles();
|
||||
File[] shared = Helper.ensureExists(context, "shared").listFiles();
|
||||
if (shared != null)
|
||||
for (File file : shared)
|
||||
if (manual || file.lastModified() + KEEP_FILES_DURATION < now) {
|
||||
|
|
Loading…
Reference in New Issue