From f943303bee02c56e9e1c8125107700d93686b528 Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 11 Aug 2018 16:13:52 +0000 Subject: [PATCH] Simplify Message ID query --- app/src/main/java/eu/faircode/email/DaoMessage.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/DaoMessage.java b/app/src/main/java/eu/faircode/email/DaoMessage.java index 68a50b73..217a7f2b 100644 --- a/app/src/main/java/eu/faircode/email/DaoMessage.java +++ b/app/src/main/java/eu/faircode/email/DaoMessage.java @@ -80,12 +80,8 @@ public interface DaoMessage { @Query("SELECT * FROM message WHERE folder = :folder AND uid = :uid") EntityMessage getMessageByUid(long folder, long uid); - @Query("SELECT message.* FROM message" + - " JOIN folder ON folder.id = message.folder" + - " WHERE message.account = :account" + - " AND folder.type <> '" + EntityFolder.ARCHIVE + "'" + - " AND msgid = :msgid") - EntityMessage getMessageByMsgId(long account, String msgid); + @Query("SELECT * FROM message WHERE msgid = :msgid") + EntityMessage getMessageByMsgId(String msgid); @Query("SELECT message.*, folder.name as folderName, folder.type as folderType" + ", (SELECT COUNT(m.id) FROM message m WHERE m.account = message.account AND m.thread = message.thread AND NOT m.ui_hide) AS count" +