From e6cfe55aa2e9bf9c1fb6ba63a94c603100f30d8b Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 28 Feb 2019 15:19:15 +0000 Subject: [PATCH] Refactoring --- app/src/main/java/eu/faircode/email/DaoAccount.java | 2 +- app/src/main/java/eu/faircode/email/DaoFolder.java | 3 ++- app/src/main/java/eu/faircode/email/DaoOperation.java | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/DaoAccount.java b/app/src/main/java/eu/faircode/email/DaoAccount.java index d8a6a62e35..5aecda365c 100644 --- a/app/src/main/java/eu/faircode/email/DaoAccount.java +++ b/app/src/main/java/eu/faircode/email/DaoAccount.java @@ -83,7 +83,7 @@ public interface DaoAccount { ", (SELECT COUNT(operation.id) FROM operation" + " JOIN folder ON folder.id = operation.folder" + " JOIN account ON account.id = folder.account" + // not outbox - " WHERE account.synchronize) AS operations") + " WHERE account.synchronize) AS operations") // including on demand LiveData liveStats(); @Query("SELECT account.id, swipe_left, l.type AS left_type, swipe_right, r.type AS right_type" + diff --git a/app/src/main/java/eu/faircode/email/DaoFolder.java b/app/src/main/java/eu/faircode/email/DaoFolder.java index 191b5b1771..11d56d9737 100644 --- a/app/src/main/java/eu/faircode/email/DaoFolder.java +++ b/app/src/main/java/eu/faircode/email/DaoFolder.java @@ -48,7 +48,8 @@ public interface DaoFolder { @Query("SELECT folder.* FROM folder" + " JOIN account ON account.id = folder.account" + - " WHERE account.synchronize AND folder.synchronize AND unified") + " WHERE account.synchronize" + + " AND folder.synchronize AND unified") List getFoldersSynchronizingUnified(); @Query("SELECT folder.* FROM folder" + diff --git a/app/src/main/java/eu/faircode/email/DaoOperation.java b/app/src/main/java/eu/faircode/email/DaoOperation.java index 786db60752..91ba2a5e0a 100644 --- a/app/src/main/java/eu/faircode/email/DaoOperation.java +++ b/app/src/main/java/eu/faircode/email/DaoOperation.java @@ -29,7 +29,7 @@ import androidx.room.Query; @Dao public interface DaoOperation { @Query("SELECT operation.*, account.name AS accountName, folder.name AS folderName" + - " ,((account.synchronize IS NULL OR account.synchronize)" + + " ,((account.synchronize IS NULL OR account.synchronize)" + // including on demand " AND (NOT folder.account IS NULL OR identity.synchronize IS NULL OR identity.synchronize)) AS synchronize" + " FROM operation" + " JOIN folder ON folder.id = operation.folder" + @@ -50,7 +50,7 @@ public interface DaoOperation { " LEFT JOIN account ON account.id = message.account" + " LEFT JOIN identity ON identity.id = message.identity" + " WHERE operation.folder = :folder" + - " AND (account.synchronize IS NULL OR account.synchronize)" + + " AND (account.synchronize IS NULL OR account.synchronize)" + // including on demand " AND (NOT folder.account IS NULL OR identity.synchronize IS NULL OR identity.synchronize)" + " ORDER BY" + " CASE WHEN operation.name = '" + EntityOperation.SYNC + "' THEN" +