From 7cc10f740d1cdc29446c768f3666392d419b143a Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 15 Dec 2018 09:11:47 +0100 Subject: [PATCH] Always sort conversation thread on time --- app/src/main/java/eu/faircode/email/DaoMessage.java | 8 ++------ app/src/main/java/eu/faircode/email/FragmentMessages.java | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/DaoMessage.java b/app/src/main/java/eu/faircode/email/DaoMessage.java index 7977cf6a70..2eb765aeb6 100644 --- a/app/src/main/java/eu/faircode/email/DaoMessage.java +++ b/app/src/main/java/eu/faircode/email/DaoMessage.java @@ -133,12 +133,8 @@ 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 'unread' = :sort THEN NOT message.ui_seen" + - " WHEN 'starred' = :sort THEN message.ui_flagged" + - " ELSE 0" + - " END DESC, message.received DESC") - DataSource.Factory pagedThread(long account, String thread, Long id, String sort, boolean debug); + " ORDER BY message.received DESC") + DataSource.Factory pagedThread(long account, String thread, Long id, boolean debug); @Query("SELECT COUNT(id)" + " FROM message" + diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index ffd4447785..15a0f26793 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -1610,7 +1610,7 @@ public class FragmentMessages extends FragmentEx { case THREAD: messages = new LivePagedListBuilder<>( - db.message().pagedThread(account, thread, threading ? null : id, sort, debug), LOCAL_PAGE_SIZE).build(); + db.message().pagedThread(account, thread, threading ? null : id, debug), LOCAL_PAGE_SIZE).build(); break; } } else {