From 2498e5be3b28fd560a087cf79f86a1e89975e892 Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 28 Jun 2019 11:00:55 +0200 Subject: [PATCH] Undo query changes --- app/src/main/java/eu/faircode/email/DaoAccount.java | 3 +-- app/src/main/java/eu/faircode/email/DaoIdentity.java | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/DaoAccount.java b/app/src/main/java/eu/faircode/email/DaoAccount.java index a3d8106abd..0b880d5d01 100644 --- a/app/src/main/java/eu/faircode/email/DaoAccount.java +++ b/app/src/main/java/eu/faircode/email/DaoAccount.java @@ -60,9 +60,8 @@ public interface DaoAccount { " AND identity.synchronize) AS identities" + ", CASE WHEN drafts.id IS NULL THEN 0 ELSE 1 END AS drafts" + " FROM account" + - " LEFT JOIN folder AS drafts ON drafts.account = account.id" + + " LEFT JOIN folder AS drafts ON drafts.account = account.id AND drafts.type = '" + EntityFolder.DRAFTS + "'" + " WHERE :all OR account.synchronize" + - " AND (drafts.type = '" + EntityFolder.DRAFTS + "' OR drafts.type IS NULL)" + " GROUP BY account.id" + " ORDER BY CASE WHEN :all THEN 0 ELSE account.`order` END" + ", CASE WHEN :all THEN 0 ELSE account.`primary` END DESC" + diff --git a/app/src/main/java/eu/faircode/email/DaoIdentity.java b/app/src/main/java/eu/faircode/email/DaoIdentity.java index 64038fde88..27b9084164 100644 --- a/app/src/main/java/eu/faircode/email/DaoIdentity.java +++ b/app/src/main/java/eu/faircode/email/DaoIdentity.java @@ -36,9 +36,8 @@ public interface DaoIdentity { @Query("SELECT identity.*, account.name AS accountName FROM identity" + " JOIN account ON account.id = identity.account" + - " JOIN folder ON folder.account = identity.account" + + " JOIN folder ON folder.account = identity.account AND folder.type = '" + EntityFolder.DRAFTS + "'" + " WHERE (:account IS NULL OR identity.account = :account)" + - " AND folder.type = '" + EntityFolder.DRAFTS + "'" + " AND identity.synchronize" + " AND account.synchronize" + " ORDER BY account.`order`, account.`primary` DESC, account.name COLLATE NOCASE" + @@ -47,9 +46,8 @@ public interface DaoIdentity { @Query("SELECT identity.*, account.name AS accountName FROM identity" + " JOIN account ON account.id = identity.account" + - " JOIN folder ON folder.account = identity.account" + + " JOIN folder ON folder.account = identity.account AND folder.type = '" + EntityFolder.DRAFTS + "'" + " WHERE (:account IS NULL OR identity.account = :account)" + - " AND folder.type = '" + EntityFolder.DRAFTS + "'" + " AND identity.synchronize" + " AND account.synchronize") LiveData> liveComposableIdentities(Long account);