1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-03-01 09:16:00 +00:00
This commit is contained in:
M66B 2024-05-30 11:19:30 +02:00
parent 37cced65bd
commit 7d10746cb2

View file

@ -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<Long> tbds = db.message().getMessagesBefore(folder.id, delete_time, keep_time, keep_unread_time, delete_unseen && !sync_unseen);
List<Long> 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);
}