From f6faf0fecca773d424b9ea442bea3ba5ede95c59 Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 3 Apr 2023 11:01:20 +0200 Subject: [PATCH] Revert "POP3: fixed hidding incorrect messages" This reverts commit 30204e3c166f79d3f2cc743b1f04509b10cd9c05. --- app/src/main/java/eu/faircode/email/Core.java | 4 ++-- app/src/main/java/eu/faircode/email/DaoMessage.java | 8 ++++---- 2 files changed, 6 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 43b78ca36c..9c3531ae00 100644 --- a/app/src/main/java/eu/faircode/email/Core.java +++ b/app/src/main/java/eu/faircode/email/Core.java @@ -3430,8 +3430,8 @@ class Core { } if (account.max_messages != null && !account.leave_on_device) { - int hidden = db.message().setMessagesUiHide(folder.id, Math.abs(account.max_messages) + flagged, reversed); - int deleted = db.message().deleteMessagesKeep(folder.id, Math.abs(account.max_messages) + flagged + 100, reversed); + int hidden = db.message().setMessagesUiHide(folder.id, Math.abs(account.max_messages) + flagged); + int deleted = db.message().deleteMessagesKeep(folder.id, Math.abs(account.max_messages) + flagged + 100); EntityLog.log(context, account.name + " POP" + " cleanup max=" + account.max_messages + "" + " hidden=" + hidden + " deleted=" + deleted); diff --git a/app/src/main/java/eu/faircode/email/DaoMessage.java b/app/src/main/java/eu/faircode/email/DaoMessage.java index f59c6ff36c..f56fba03f7 100644 --- a/app/src/main/java/eu/faircode/email/DaoMessage.java +++ b/app/src/main/java/eu/faircode/email/DaoMessage.java @@ -792,9 +792,9 @@ public interface DaoMessage { " AND id NOT IN (" + " SELECT id FROM message" + " WHERE folder = :folder" + - " ORDER BY CASE WHEN :reversed THEN -received ELSE received END DESC" + + " ORDER BY received DESC" + " LIMIT :keep)") - int setMessagesUiHide(long folder, int keep, boolean reversed); + int setMessagesUiHide(long folder, int keep); @Transaction @Query("UPDATE message SET ui_ignored = :ui_ignored WHERE id = :id AND NOT (ui_ignored IS :ui_ignored)") @@ -1018,7 +1018,7 @@ public interface DaoMessage { " AND id NOT IN (" + " SELECT id FROM message" + " WHERE folder = :folder" + - " ORDER BY CASE WHEN :reversed THEN -received ELSE received END DESC" + + " ORDER BY received DESC" + " LIMIT :keep)") - int deleteMessagesKeep(long folder, int keep, boolean reversed); + int deleteMessagesKeep(long folder, int keep); } \ No newline at end of file