From e65c5c44ec63852e3190053b12d001c35ca5355e Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 24 Jul 2019 20:17:55 +0200 Subject: [PATCH] Prefer to show non drafts when searching globally --- app/src/main/java/eu/faircode/email/DaoMessage.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/faircode/email/DaoMessage.java b/app/src/main/java/eu/faircode/email/DaoMessage.java index 23393ef136..e060ccd3ea 100644 --- a/app/src/main/java/eu/faircode/email/DaoMessage.java +++ b/app/src/main/java/eu/faircode/email/DaoMessage.java @@ -48,7 +48,11 @@ public interface DaoMessage { ", SUM(CASE WHEN folder.type = '" + EntityFolder.DRAFTS + "' THEN 1 ELSE 0 END) AS drafts" + ", COUNT(DISTINCT CASE WHEN message.msgid IS NULL THEN message.id ELSE message.msgid END) AS visible" + ", SUM(message.size) AS totalSize" + - ", MAX(CASE WHEN :found OR (:type IS NULL AND folder.unified) OR folder.type = :type THEN message.received ELSE 0 END) AS dummy" + + ", MAX(CASE WHEN" + + " ((:found 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 0 END) AS dummy" + " FROM message" + " JOIN account ON account.id = message.account" + " LEFT JOIN identity ON identity.id = message.identity" +