From 45d0fdace5371ff160001b367b7aff7d8539b77a Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 29 Apr 2020 20:26:07 +0200 Subject: [PATCH] Revert "Another try" This reverts commit ad99350f5c499c18863907e3f48a732d1379bdbf. --- .../main/java/eu/faircode/email/DaoMessage.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/DaoMessage.java b/app/src/main/java/eu/faircode/email/DaoMessage.java index c9d439ec73..50a06947b2 100644 --- a/app/src/main/java/eu/faircode/email/DaoMessage.java +++ b/app/src/main/java/eu/faircode/email/DaoMessage.java @@ -60,14 +60,14 @@ public interface DaoMessage { " WHEN NOT message.msgid IS NULL THEN message.msgid" + " ELSE message.id END) AS visible" + ", SUM(message.total) AS totalSize" + - ", message.priority AS ui_priority" + - ", message.importance AS ui_importance" + + ", MAX(message.priority) AS ui_priority" + + ", MAX(message.importance) AS ui_importance" + ", MAX(CASE WHEN" + " ((:found AND folder.type <> '" + EntityFolder.ARCHIVE + "' AND folder.type <> '" + EntityFolder.DRAFTS + "')" + " OR (NOT :found AND :type IS NULL AND folder.unified)" + " OR (NOT :found AND folder.type = :type))" + - " THEN message.received ELSE NULL END) AS dummy" + - " FROM message" + + " THEN message.received ELSE 0 END) AS dummy" + + " FROM (SELECT * FROM message ORDER BY received DESC) AS message" + " JOIN account_view AS account ON account.id = message.account" + " LEFT JOIN identity_view AS identity ON identity.id = message.identity" + " JOIN folder_view AS folder ON folder.id = message.folder" + @@ -123,10 +123,10 @@ public interface DaoMessage { " WHEN NOT message.msgid IS NULL THEN message.msgid" + " ELSE message.id END) AS visible" + ", SUM(message.total) AS totalSize" + - ", message.priority AS ui_priority" + - ", message.importance AS ui_importance" + - ", MAX(CASE WHEN folder.id = :folder THEN message.received ELSE NULL END) AS dummy" + - " FROM message" + + ", MAX(message.priority) AS ui_priority" + + ", MAX(message.importance) AS ui_importance" + + ", MAX(CASE WHEN folder.id = :folder THEN message.received ELSE 0 END) AS dummy" + + " FROM (SELECT * FROM message ORDER BY received DESC) AS message" + " JOIN account_view AS account ON account.id = message.account" + " LEFT JOIN identity_view AS identity ON identity.id = message.identity" + " JOIN folder_view AS folder ON folder.id = message.folder" +