From 1774a619e03e09f3dcb1c4b9a8c1853ac9b1fdc1 Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 26 Jun 2019 07:39:48 +0200 Subject: [PATCH] Check message/attachment files on manual clean only --- .../java/eu/faircode/email/WorkerCleanup.java | 40 ++++++++++--------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/WorkerCleanup.java b/app/src/main/java/eu/faircode/email/WorkerCleanup.java index 2465d8d4e1..809a0f7a8a 100644 --- a/app/src/main/java/eu/faircode/email/WorkerCleanup.java +++ b/app/src/main/java/eu/faircode/email/WorkerCleanup.java @@ -135,27 +135,29 @@ public class WorkerCleanup extends Worker { Log.w("Error deleting " + file); } - // Check message files - Log.i("Checking message files"); - List mids = db.message().getMessageWithContent(); - for (Long mid : mids) { - EntityMessage message = db.message().getMessage(mid); - File file = message.getFile(context); - if (!file.exists()) { - Log.w("Message file missing id=" + mid); - db.message().setMessageContent(mid, false); + if (manual) { + // Check message files + Log.i("Checking message files"); + List mids = db.message().getMessageWithContent(); + for (Long mid : mids) { + EntityMessage message = db.message().getMessage(mid); + File file = message.getFile(context); + if (!file.exists()) { + Log.w("Message file missing id=" + mid); + db.message().setMessageContent(mid, false); + } } - } - // Check attachments files - Log.i("Checking attachments files"); - List aids = db.attachment().getAttachmentAvailable(); - for (Long aid : aids) { - EntityAttachment attachment = db.attachment().getAttachment(aid); - File file = attachment.getFile(context); - if (!file.exists()) { - Log.w("Attachment file missing id=" + aid); - db.attachment().setUnavailable(aid); + // Check attachments files + Log.i("Checking attachments files"); + List aids = db.attachment().getAttachmentAvailable(); + for (Long aid : aids) { + EntityAttachment attachment = db.attachment().getAttachment(aid); + File file = attachment.getFile(context); + if (!file.exists()) { + Log.w("Attachment file missing id=" + aid); + db.attachment().setUnavailable(aid); + } } }