From e878a9fe2aeb2df173209645b474e3f18ddb10db Mon Sep 17 00:00:00 2001 From: M66B Date: Sun, 7 Jul 2019 11:47:39 +0200 Subject: [PATCH] Revert "Enable auto delete for spam" This reverts commit 40d55cfd002750efd559a07177485aa3a6c9a249. --- app/src/main/java/eu/faircode/email/Core.java | 3 +-- app/src/main/java/eu/faircode/email/FragmentFolder.java | 5 +---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java index b77ac1cb4a..8ff034d2b2 100644 --- a/app/src/main/java/eu/faircode/email/Core.java +++ b/app/src/main/java/eu/faircode/email/Core.java @@ -1001,8 +1001,7 @@ class Core { Log.i(folder.name + " sync=" + new Date(sync_time) + " keep=" + new Date(keep_time)); // Delete old local messages - if (auto_delete && - (EntityFolder.JUNK.equals(folder.type) || EntityFolder.TRASH.equals(folder.type))) { + if (auto_delete && EntityFolder.TRASH.equals(folder.type)) { List tbds = db.message().getMessagesBefore(folder.id, keep_time, delete_unseen); Log.i(folder.name + " local tbd=" + tbds.size()); for (Long tbd : tbds) { diff --git a/app/src/main/java/eu/faircode/email/FragmentFolder.java b/app/src/main/java/eu/faircode/email/FragmentFolder.java index de48d71c54..eac8160332 100644 --- a/app/src/main/java/eu/faircode/email/FragmentFolder.java +++ b/app/src/main/java/eu/faircode/email/FragmentFolder.java @@ -210,10 +210,7 @@ public class FragmentFolder extends FragmentBase { else etKeepDays.setText(Integer.toString(folder == null ? EntityFolder.DEFAULT_KEEP : folder.keep_days)); cbAutoDelete.setChecked(folder == null ? false : folder.auto_delete); - cbAutoDelete.setVisibility( - folder != null && - (EntityFolder.JUNK.equals(folder.type) || EntityFolder.TRASH.equals(folder.type)) - ? View.VISIBLE : View.GONE); + cbAutoDelete.setVisibility(folder != null && EntityFolder.TRASH.equals(folder.type) ? View.VISIBLE : View.GONE); } // Consider previous save as cancelled