Keep attachments of unread/flagged messages

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

@@ -105,11 +105,10 @@ public interface DaoAttachment {
             "   JOIN folder ON folder.id = message.folder" +
             "   WHERE a.id = attachment.id" +
             "   AND a.available" +
-            "   AND (message.stored < :now - folder.sync_days * 24 * 3600 * 1000" +
+            "   AND message.ui_seen" +
-            "   OR (:extra AND" +
+            "   AND NOT message.ui_flagged" +
-            "   (folder.type = '" + EntityFolder.TRASH + "'" +
+            "   AND message.received < :now - (folder.sync_days + 1) * 24 * 3600 * 1000)")
-            "    OR folder.type = '" + EntityFolder.JUNK + "'))))")
+    int purge(long now);
-    int purge(long now, boolean extra);
 
     @Insert
     long insertAttachment(EntityAttachment attachment);

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

@@ -107,8 +107,7 @@ public class WorkerCleanup extends Worker {
 
                 // Delete old attachments
                 if (cleanup_attachments) {
-                    int purged = db.attachment().purge(
+                    int purged = db.attachment().purge(new Date().getTime());
-                            new Date().getTime(), BuildConfig.DEBUG);
                     Log.i("Attachments purged=" + purged);
                 }