mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed touched order

This commit is contained in:
M66B 2024-05-07 21:19:09 +02:00
parent b56045b66e
commit 0157efb61d
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,6 +112,7 @@ public interface DaoMessage {
" WHEN 'size' = :sort1 THEN -SUM(message.total)" +
" WHEN 'attachments' = :sort1 THEN -SUM(message.attachments)" +
" WHEN 'snoozed' = :sort1 THEN SUM(CASE WHEN message.ui_snoozed IS NULL THEN 0 ELSE 1 END) = 0" +
" WHEN 'touched' = :sort1 THEN IFNULL(-message.last_attempt, 0)" +
" ELSE 0" +
" END" +
", CASE" +
@ -191,6 +192,7 @@ public interface DaoMessage {
" WHEN 'size' = :sort1 THEN -SUM(message.total)" +
" WHEN 'attachments' = :sort1 THEN -SUM(message.attachments)" +
" WHEN 'snoozed' = :sort1 THEN SUM(CASE WHEN message.ui_snoozed IS NULL THEN 0 ELSE 1 END) = 0" +
" WHEN 'touched' = :sort1 THEN IFNULL(-message.last_attempt, 0)" +
" ELSE 0" +
" END" +
", CASE" +

4
app/src/main/java/eu/faircode/email/ViewModelMessages.java
View File

@ -184,7 +184,7 @@ public class ViewModelMessages extends ViewModel {
db.message().pagedUnified(
null,
args.threading, false,
"time", "", false,
criteria == null || criteria.touched == null ? "time" : "touched", "", false,
false, false, false, false, false,
null,
true,
@ -194,7 +194,7 @@ public class ViewModelMessages extends ViewModel {
builder = new LivePagedListBuilder<>(
db.message().pagedFolder(
args.folder, args.threading,
"time", "", false,
criteria == null || criteria.touched == null ? "time" : "touched", "", false,
false, false, false, false, false,
null,
true,