From 1a9656c7c079b7ff239f41f3c01e305a82679f07 Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 30 Jan 2019 11:55:44 +0000 Subject: [PATCH] Fixed outbox manual sync --- FAQ.md | 1 + app/src/main/java/eu/faircode/email/DaoOperation.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/FAQ.md b/FAQ.md index a3800ac043..ff5b9013f9 100644 --- a/FAQ.md +++ b/FAQ.md @@ -987,6 +987,7 @@ but even Google's Chrome cannot handle this. * Did you know that FairEmail has a tablet mode? Rotate your device in landscape mode and conversation threads will be opened in a second column if there is enough screen space. * Did you know that you can long press a reply template to create a draft message from the template? * Did you know that you can long press, hold and swipe to select a range of messages? +* Did you know that you can retry sending messages by using pull-down-to-refresh in the outbox?
diff --git a/app/src/main/java/eu/faircode/email/DaoOperation.java b/app/src/main/java/eu/faircode/email/DaoOperation.java index 8a9c6dd40a..e2de2564b6 100644 --- a/app/src/main/java/eu/faircode/email/DaoOperation.java +++ b/app/src/main/java/eu/faircode/email/DaoOperation.java @@ -30,7 +30,7 @@ import androidx.room.Query; public interface DaoOperation { @Query("SELECT operation.*, account.name AS accountName, folder.name AS folderName" + " ,((account.synchronize IS NULL OR account.synchronize)" + - " AND (NOT folder.account IS NULL OR identity.synchronize)) AS synchronize" + + " 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" + " LEFT JOIN message ON message.id = operation.message" + @@ -51,7 +51,7 @@ public interface DaoOperation { " LEFT JOIN identity ON identity.id = message.identity" + " WHERE operation.folder = :folder" + " AND (account.synchronize IS NULL OR account.synchronize)" + - " AND (NOT folder.account IS NULL OR identity.synchronize)" + + " AND (NOT folder.account IS NULL OR identity.synchronize IS NULL OR identity.synchronize)" + " ORDER BY" + " CASE WHEN operation.name = '" + EntityOperation.SYNC + "' THEN" + " CASE WHEN folder.account IS NULL THEN -1 ELSE 1 END" + // outbox