Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-14 21:13:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added sort on subject

Browse Source
This commit is contained in:
M66B
2019-03-05 07:50:53 +00:00
parent ef2d3940a6
commit bebc100c6d
4 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,12 +68,13 @@ public interface DaoMessage {
" GROUP BY account.id, CASE WHEN message.thread IS NULL OR NOT :threading THEN message.id ELSE message.thread END" +
" HAVING :found OR SUM(unified) > 0" +
" ORDER BY" +
" CASE WHEN 'sender' = :sort THEN message.sender ELSE '' END," +
" CASE" +
" WHEN 'unread' = :sort THEN " + unseen_unified + " > 0" +
" WHEN 'starred' = :sort THEN COUNT(message.id) - " + unflagged_unified + " > 0" +
" WHEN 'unread' = :sort THEN " + unseen_unified + " = 0" +
" WHEN 'starred' = :sort THEN COUNT(message.id) - " + unflagged_unified + " = 0" +
" WHEN 'sender' = :sort THEN LOWER(message.sender)" +
" WHEN 'subject' = :sort THEN LOWER(message.subject)" +
" ELSE 0" +
" END DESC, message.received DESC")
" END, message.received DESC")
@SuppressWarnings(RoomWarnings.CURSOR_MISMATCH)
DataSource.Factory<Integer, TupleMessageEx> pagedUnifiedInbox(boolean threading, String sort, boolean snoozed, boolean found, boolean debug);
@@ -109,12 +110,13 @@ public interface DaoMessage {
" GROUP BY CASE WHEN message.thread IS NULL OR NOT :threading THEN message.id ELSE message.thread END" +
" HAVING SUM(CASE WHEN folder.id = :folder THEN 1 ELSE 0 END) > 0" +
" ORDER BY" +
" CASE WHEN 'sender' = :sort THEN message.sender ELSE '' END," +
" CASE" +
" WHEN 'unread' = :sort THEN " + unseen_folder + " > 0" +
" WHEN 'starred' = :sort THEN COUNT(message.id) - " + unflagged_folder + " > 0" +
" WHEN 'unread' = :sort THEN " + unseen_folder + " = 0" +
" WHEN 'starred' = :sort THEN COUNT(message.id) - " + unflagged_folder + " = 0" +
" WHEN 'sender' = :sort THEN LOWER(message.sender)" +
" WHEN 'subject' = :sort THEN LOWER(message.subject)" +
" ELSE 0" +
" END DESC, message.received DESC")
" END, message.received DESC")
@SuppressWarnings(RoomWarnings.CURSOR_MISMATCH)
DataSource.Factory<Integer, TupleMessageEx> pagedFolder(long folder, boolean threading, String sort, boolean snoozed, boolean found, boolean debug);

7
app/src/main/java/eu/faircode/email/FragmentMessages.java
View File

@@ -1746,6 +1746,8 @@ public class FragmentMessages extends FragmentBase {
menu.findItem(R.id.menu_sort_on_starred).setChecked(true);
else if ("sender".equals(sort))
menu.findItem(R.id.menu_sort_on_sender).setChecked(true);
else if ("subject".equals(sort))
menu.findItem(R.id.menu_sort_on_subject).setChecked(true);
menu.findItem(R.id.menu_zoom).setVisible(!selection);
@@ -1787,6 +1789,11 @@ public class FragmentMessages extends FragmentBase {
onMenuSort("sender");
return true;
case R.id.menu_sort_on_subject:
item.setChecked(true);
onMenuSort("subject");
return true;
case R.id.menu_zoom:
onMenuZoom();
return true;