Prevent browsed orphans

This commit is contained in:
M66B
2019-03-18 09:41:46 +00:00
parent 3a85a016f8
commit b99d7dd4eb
2 changed files with 3 additions and 4 deletions

View File

@@ -297,9 +297,6 @@ public interface DaoMessage {
@Query("UPDATE message SET ui_hide = :ui_hide WHERE id = :id")
int setMessageUiHide(long id, boolean ui_hide);
@Query("UPDATE message SET ui_browsed = :ui_browsed WHERE id = :id")
int setMessageUiBrowsed(long id, boolean ui_browsed);
@Query("UPDATE message SET ui_ignored = :ui_ignored WHERE id = :id")
int setMessageUiIgnored(long id, boolean ui_ignored);
@@ -363,7 +360,6 @@ public interface DaoMessage {
@Query("DELETE FROM message" +
" WHERE folder = :folder" +
" AND uid IS NULL" +
" AND NOT ui_browsed" +
" AND NOT EXISTS" +
" (SELECT * FROM operation" +
" WHERE operation.message = message.id" +

View File

@@ -147,6 +147,7 @@ public class EntityOperation {
long uid = message.uid;
boolean seen = message.seen;
boolean ui_seen = message.ui_seen;
boolean ui_browsed = message.ui_browsed;
message.id = null;
message.account = target.account;
message.folder = target.id;
@@ -155,6 +156,7 @@ public class EntityOperation {
message.seen = true;
message.ui_seen = true;
}
message.ui_browsed = false;
message.id = db.message().insertMessage(message);
File mtarget = message.getFile(context);
tmpid = message.id;
@@ -165,6 +167,7 @@ public class EntityOperation {
message.uid = uid;
message.seen = seen;
message.ui_seen = ui_seen;
message.ui_browsed = ui_browsed;
if (message.content)
try {