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

Purge after move/copy

This commit is contained in:
M66B 2020-11-10 19:14:21 +01:00
parent d8486845c9
commit 620ddc4e09
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2996,7 +2996,8 @@ class Core {
if (message.ui_hide &&
message.ui_snoozed == null &&
(message.ui_busy == null || message.ui_busy < new Date().getTime()) &&
db.operation().getOperationCount(folder.id, message.id) == 0) {
db.operation().getOperationCount(folder.id, message.id) == 0 &&
db.operation().getOperationCount(folder.id, EntityOperation.PURGE) == 0) {
update = true;
message.ui_hide = false;
Log.i(folder.name + " updated id=" + message.id + " uid=" + message.uid + " unhide");

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

@ -34,7 +34,6 @@ public interface DaoOperation {
" WHEN operation.name = '" + EntityOperation.ATTACHMENT + "' THEN -3" +
" WHEN operation.name = '" + EntityOperation.HEADERS + "' THEN -2" +
" WHEN operation.name = '" + EntityOperation.RAW + "' THEN -2" +
" WHEN operation.name = '" + EntityOperation.PURGE + "' THEN -2" +
" WHEN operation.name = '" + EntityOperation.SYNC + "' AND folder.account IS NULL THEN -1" + // Outbox
" WHEN operation.name = '" + EntityOperation.SYNC + "' AND folder.account IS NOT NULL THEN 1" +
// Other operations: add, delete, seen, answered, flag, keyword, label, subscribe, send
@ -42,6 +41,7 @@ public interface DaoOperation {
" WHEN operation.name = '" + EntityOperation.EXISTS + "' THEN 3" +
" WHEN operation.name = '" + EntityOperation.MOVE + "' THEN 4" +
" WHEN operation.name = '" + EntityOperation.COPY + "' THEN 4" +
" WHEN operation.name = '" + EntityOperation.PURGE + "' THEN 5" +
" ELSE 0" +
" END";

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

@ -742,7 +742,7 @@ public class FragmentFolders extends FragmentBase {
db.endTransaction();
}
ServiceSynchronize.eval(context, "delete");
ServiceSynchronize.eval(context, "purge");
return null;
}

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

@ -7343,7 +7343,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
db.endTransaction();
}
ServiceSynchronize.eval(context, "delete");
ServiceSynchronize.eval(context, "purge");
return null;
}