diff --git a/app/src/main/java/eu/faircode/email/DaoFolder.java b/app/src/main/java/eu/faircode/email/DaoFolder.java index 2c5ef7818c..b24ed4f21e 100644 --- a/app/src/main/java/eu/faircode/email/DaoFolder.java +++ b/app/src/main/java/eu/faircode/email/DaoFolder.java @@ -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> 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 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" + diff --git a/app/src/main/java/eu/faircode/email/TupleFolderEx.java b/app/src/main/java/eu/faircode/email/TupleFolderEx.java index ad5146b466..a201ea2988 100644 --- a/app/src/main/java/eu/faircode/email/TupleFolderEx.java +++ b/app/src/main/java/eu/faircode/email/TupleFolderEx.java @@ -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);