Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-30 21:58:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Added sort on sent time"

Browse Source 
This reverts commit 0e37fd6b5b.
This commit is contained in:
M66B
2020-02-06 22:35:36 +01:00
parent 0e37fd6b5b
commit 90f12f800f
11 changed files with 58 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/eu/faircode/email/DaoMessage.java
View File

@@ -92,13 +92,12 @@ public interface DaoMessage {
" WHEN 'snoozed' = :sort THEN SUM(CASE WHEN message.ui_snoozed IS NULL THEN 0 ELSE 1 END) = 0" +
" ELSE 0" +
" END" +
", CASE WHEN :use_sent_time THEN message.sent ELSE message.received END" +
" * CASE WHEN :ascending THEN 1 ELSE -1 END")
", CASE WHEN :ascending THEN message.received ELSE -message.received END")
@SuppressWarnings(RoomWarnings.CURSOR_MISMATCH)
DataSource.Factory<Integer, TupleMessageEx> pagedUnified(
String type,
boolean threading,
String sort, boolean use_sent_time, boolean ascending,
String sort, boolean ascending,
boolean filter_seen, boolean filter_unflagged, boolean filter_unknown, boolean filter_snoozed,
boolean found,
boolean debug);
@@ -148,12 +147,11 @@ public interface DaoMessage {
" WHEN 'snoozed' = :sort THEN SUM(CASE WHEN message.ui_snoozed IS NULL THEN 0 ELSE 1 END) = 0" +
" ELSE 0" +
" END" +
", CASE WHEN :use_sent_time THEN message.sent ELSE message.received END" +
" * CASE WHEN :ascending THEN 1 ELSE -1 END")
", CASE WHEN :ascending THEN message.received ELSE -message.received END")
@SuppressWarnings(RoomWarnings.CURSOR_MISMATCH)
DataSource.Factory<Integer, TupleMessageEx> pagedFolder(
long folder, boolean threading,
String sort, boolean use_sent_time, boolean ascending,
String sort, boolean ascending,
boolean filter_seen, boolean filter_unflagged, boolean filter_unknown, boolean filter_snoozed,
boolean found,
boolean debug);
@@ -182,8 +180,7 @@ public interface DaoMessage {
" AND message.thread = :thread" +
" AND (:id IS NULL OR message.id = :id)" +
" AND (NOT message.ui_hide OR :debug)" +
" ORDER BY CASE WHEN :use_sent_time THEN message.sent ELSE message.received END" +
" * CASE WHEN :ascending THEN 1 ELSE -1 END" +
" ORDER BY CASE WHEN :ascending THEN message.received ELSE -message.received END" +
", CASE" +
" WHEN folder.type = '" + EntityFolder.INBOX + "' THEN 1" +
" WHEN folder.type = '" + EntityFolder.OUTBOX + "' THEN 2" +
@@ -196,8 +193,7 @@ public interface DaoMessage {
" WHEN folder.type = '" + EntityFolder.JUNK + "' THEN 9" +
" ELSE 999 END")
// The folder type sort order should match the duplicate algorithm
DataSource.Factory<Integer, TupleMessageEx> pagedThread(
long account, String thread, Long id, boolean use_sent_time, boolean ascending, boolean debug);
DataSource.Factory<Integer, TupleMessageEx> pagedThread(long account, String thread, Long id, boolean ascending, boolean debug);
@Query("SELECT account.name AS accountName" +
", COUNT(message.id) AS count" +