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

Simplify rule ordering

Browse Source
This commit is contained in:
M66B
2019-04-27 21:40:32 +02:00
parent 58b8c071be
commit e10329c6ca
2 changed files with 3 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,13 +31,13 @@ import java.util.List;
public interface DaoRule {
@Query("SELECT * FROM rule" +
" WHERE folder = :folder" +
" ORDER BY `order`, name")
" ORDER BY `order`, name COLLATE NOCASE")
List<EntityRule> getRules(long folder);
@Query("SELECT * FROM rule" +
" WHERE folder = :folder" +
" AND enabled" +
" ORDER BY `order`, name")
" ORDER BY `order`, name COLLATE NOCASE")
List<EntityRule> getEnabledRules(long folder);
@Query("SELECT rule.*, folder.account, folder.name AS folderName, account.name AS accountName FROM rule" +
@@ -50,7 +50,7 @@ public interface DaoRule {
" JOIN folder ON folder.id = rule.folder" +
" JOIN account ON account.id = folder.account" +
" WHERE rule.folder = :folder" +
" ORDER BY `order`, name")
" ORDER BY `order`, name COLLATE NOCASE")
LiveData<List<TupleRuleEx>> liveRules(long folder);
@Insert