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

Fixed/improved operation counts

This commit is contained in:
M66B 2019-06-13 13:43:34 +02:00
parent a59a14a279
commit e7b9eb56b9
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/eu/faircode/email/Core.java
View File

@ -691,6 +691,7 @@ class Core {
Log.i(folder.name + " queuing ADD id=" + message.id + ":" + target); Log.i(folder.name + " queuing ADD id=" + message.id + ":" + target);
EntityOperation operation = new EntityOperation(); EntityOperation operation = new EntityOperation();
operation.account = message.account;
operation.folder = target; operation.folder = target;
operation.message = message.id; operation.message = message.id;
operation.name = EntityOperation.ADD; operation.name = EntityOperation.ADD;

17
app/src/main/java/eu/faircode/email/DaoOperation.java
View File

@ -34,7 +34,7 @@ public interface DaoOperation {
" FROM operation" + " FROM operation" +
" JOIN folder ON folder.id = operation.folder" + " JOIN folder ON folder.id = operation.folder" +
" LEFT JOIN message ON message.id = operation.message" + " LEFT JOIN message ON message.id = operation.message" +
" LEFT JOIN account ON account.id = message.account OR account.id = folder.account" + " LEFT JOIN account ON account.id = operation.account OR account.id = folder.account" +
" LEFT JOIN identity ON identity.id = message.identity" + " LEFT JOIN identity ON identity.id = message.identity" +
" ORDER BY" + " ORDER BY" +
" CASE WHEN operation.name = '" + EntityOperation.SYNC + "' THEN" + " CASE WHEN operation.name = '" + EntityOperation.SYNC + "' THEN" +
@ -47,7 +47,7 @@ public interface DaoOperation {
String GET_OPS_FOLDER = "SELECT operation.* FROM operation" + String GET_OPS_FOLDER = "SELECT operation.* FROM operation" +
" JOIN folder ON folder.id = operation.folder" + " JOIN folder ON folder.id = operation.folder" +
" LEFT JOIN message ON message.id = operation.message" + " LEFT JOIN message ON message.id = operation.message" +
" LEFT JOIN account ON account.id = message.account" + " LEFT JOIN account ON account.id = operation.account" +
" LEFT JOIN identity ON identity.id = message.identity" + " LEFT JOIN identity ON identity.id = message.identity" +
" WHERE operation.folder = :folder" + " WHERE operation.folder = :folder" +
" AND (account.synchronize IS NULL OR account.synchronize)" + " AND (account.synchronize IS NULL OR account.synchronize)" +
@ -67,11 +67,20 @@ public interface DaoOperation {
@Query("SELECT COUNT(operation.id) AS pending" + @Query("SELECT COUNT(operation.id) AS pending" +
", SUM(CASE WHEN operation.error IS NULL THEN 0 ELSE 1 END) AS errors" + ", SUM(CASE WHEN operation.error IS NULL THEN 0 ELSE 1 END) AS errors" +
" FROM operation") " FROM operation" +
" JOIN folder ON folder.id = operation.folder" +
" LEFT JOIN message ON message.id = operation.message" +
" LEFT JOIN account ON account.id = operation.account" +
" LEFT JOIN identity ON identity.id = message.identity" +
" WHERE (account.synchronize IS NULL OR account.synchronize)" +
" AND (NOT folder.account IS NULL OR identity.synchronize IS NULL OR identity.synchronize)")
LiveData<TupleOperationStats> liveStats(); LiveData<TupleOperationStats> liveStats();
@Query("SELECT COUNT(operation.id) FROM operation" + @Query("SELECT COUNT(operation.id) FROM operation" +
" WHERE operation.name = '" + EntityOperation.SEND + "'") " JOIN message ON message.id = operation.message" +
" JOIN identity ON identity.id = message.identity" +
" WHERE operation.name = '" + EntityOperation.SEND + "'" +
" AND identity.synchronize")
LiveData<Integer> liveUnsent(); LiveData<Integer> liveUnsent();
@Query("SELECT * FROM operation ORDER BY id") @Query("SELECT * FROM operation ORDER BY id")