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

Cleanup

This commit is contained in:
M66B 2019-03-12 14:33:38 +00:00
parent 120157066a
commit 7364b97cb7
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/eu/faircode/email/DaoFolder.java
View File

@ -52,8 +52,7 @@ public interface DaoFolder {
EntityFolder getBrowsableFolder(long folder, boolean search);
@Query("SELECT folder.*" +
", account.name AS accountName, account.color AS accountColor" +
", account.state AS accountState, account.error AS accountError" +
", account.name AS accountName, account.color AS accountColor, account.state AS accountState" +
", COUNT(message.id) AS messages" +
", SUM(CASE WHEN message.content = 1 THEN 1 ELSE 0 END) AS content" +
", SUM(CASE WHEN message.ui_seen = 0 THEN 1 ELSE 0 END) AS unseen" +
@ -68,8 +67,7 @@ public interface DaoFolder {
LiveData<List<TupleFolderEx>> liveFolders(Long account);
@Query("SELECT folder.*" +
", account.name AS accountName, account.color AS accountColor" +
", account.state AS accountState, account.error AS accountError" +
", account.name AS accountName, account.color AS accountColor, account.state AS accountState" +
", COUNT(message.id) AS messages" +
", SUM(CASE WHEN message.content = 1 THEN 1 ELSE 0 END) AS content" +
", SUM(CASE WHEN message.ui_seen = 0 THEN 1 ELSE 0 END) AS unseen" +
@ -89,8 +87,7 @@ public interface DaoFolder {
LiveData<EntityFolder> livePrimaryDrafts();
@Query("SELECT folder.*" +
", account.name AS accountName, account.color AS accountColor" +
", account.state AS accountState, account.error AS accountError" +
", account.name AS accountName, account.color AS accountColor, account.state AS accountState" +
", COUNT(message.id) AS messages" +
", SUM(CASE WHEN message.content = 1 THEN 1 ELSE 0 END) AS content" +
", SUM(CASE WHEN message.ui_seen = 0 THEN 1 ELSE 0 END) AS unseen" +

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

@ -25,7 +25,6 @@ public class TupleFolderEx extends EntityFolder {
public String accountName;
public Integer accountColor;
public String accountState;
public String accountError;
public int messages;
public int content;
public int unseen;
@ -38,7 +37,6 @@ public class TupleFolderEx extends EntityFolder {
Objects.equals(accountName, other.accountName) &&
Objects.equals(this.accountColor, other.accountColor) &&
Objects.equals(accountState, other.accountState) &&
Objects.equals(accountError, other.accountError) &&
this.messages == other.messages &&
this.content == other.content &&
this.unseen == other.unseen);