mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "Enable auto delete for spam" 

This reverts commit 40d55cfd00.
This commit is contained in:
M66B 2019-07-07 11:47:39 +02:00
parent ba4fc168de
commit e878a9fe2a
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/eu/faircode/email/Core.java
View File

@ -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<Long> tbds = db.message().getMessagesBefore(folder.id, keep_time, delete_unseen);
Log.i(folder.name + " local tbd=" + tbds.size());
for (Long tbd : tbds) {

5
app/src/main/java/eu/faircode/email/FragmentFolder.java
View File

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