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

Properly sort rules

This commit is contained in:
M66B 2019-03-17 10:25:20 +00:00
parent 9f30511257
commit e52f478b22
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/eu/faircode/email/DaoRule.java
View File

@ -31,7 +31,7 @@ import androidx.room.Update;
public interface DaoRule {
@Query("SELECT * FROM rule" +
" WHERE folder = :folder" +
" ORDER BY `order`")
" ORDER BY `order`, name")
List<EntityRule> getRules(long folder);
@Query("SELECT * FROM rule" +
@ -49,7 +49,8 @@ public interface DaoRule {
@Query("SELECT rule.*, folder.account, folder.name AS folderName, account.name AS accountName FROM rule" +
" JOIN folder ON folder.id = rule.folder" +
" JOIN account ON account.id = folder.account" +
" WHERE rule.folder = :folder")
" WHERE rule.folder = :folder" +
" ORDER BY `order`, name")
LiveData<List<TupleRuleEx>> liveRules(long folder);
@Insert