From 7d10746cb211ecb2db0282f280c5666a179206c1 Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 30 May 2024 11:19:30 +0200 Subject: [PATCH] Oops --- app/src/main/java/eu/faircode/email/Core.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java index 79ab88becf..d0b539e72e 100644 --- a/app/src/main/java/eu/faircode/email/Core.java +++ b/app/src/main/java/eu/faircode/email/Core.java @@ -3876,7 +3876,7 @@ class Core { keep_time = 0; long keep_unread_time = cal_keep_unread.getTimeInMillis(); - if (keep_unread_time < 0 || sync_unseen) + if (keep_unread_time < 0) keep_unread_time = 0; Log.i(folder.name + " sync=" + new Date(sync_time) + @@ -3886,7 +3886,7 @@ class Core { // Delete old local messages long delete_time = new Date().getTime() - 3600 * 1000L; if (auto_delete) { - List tbds = db.message().getMessagesBefore(folder.id, delete_time, keep_time, keep_unread_time, delete_unseen && !sync_unseen); + List tbds = db.message().getMessagesBefore(folder.id, delete_time, keep_time, keep_unread_time, delete_unseen); Log.i(folder.name + " local tbd=" + tbds.size()); EntityFolder trash = db.folder().getFolderByType(folder.account, EntityFolder.TRASH); for (Long tbd : tbds) { @@ -3899,7 +3899,8 @@ class Core { EntityOperation.queue(context, message, EntityOperation.MOVE, trash.id); } } else { - int old = db.message().deleteMessagesBefore(folder.id, delete_time, keep_time, keep_unread_time, delete_unseen && !sync_unseen); + int old = db.message().deleteMessagesBefore(folder.id, delete_time, keep_time, + sync_unseen ? 0 : keep_unread_time, delete_unseen && !sync_unseen); Log.i(folder.name + " local old=" + old); }