mirror of https://github.com/M66B/FairEmail.git
Fixed setting seen
This commit is contained in:
parent
2663cd1e42
commit
6ea780d524
|
@ -665,10 +665,8 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
|
||||||
db.beginTransaction();
|
db.beginTransaction();
|
||||||
|
|
||||||
EntityMessage message = db.message().getMessage(id);
|
EntityMessage message = db.message().getMessage(id);
|
||||||
for (EntityMessage tmessage : db.message().getMessageByThread(message.account, message.thread))
|
for (EntityMessage tmessage : db.message().getMessageByThread(message.account, message.thread)) {
|
||||||
if (message.uid != null) { // Skip drafts and outbox
|
|
||||||
db.message().setMessageUiSeen(tmessage.id, true);
|
db.message().setMessageUiSeen(tmessage.id, true);
|
||||||
|
|
||||||
EntityOperation.queue(db, tmessage, EntityOperation.SEEN, true);
|
EntityOperation.queue(db, tmessage, EntityOperation.SEEN, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -103,7 +103,8 @@ public interface DaoMessage {
|
||||||
@Query("SELECT message.* FROM message" +
|
@Query("SELECT message.* FROM message" +
|
||||||
" JOIN folder ON folder.id = message.folder" +
|
" JOIN folder ON folder.id = message.folder" +
|
||||||
" WHERE message.account = :account" +
|
" WHERE message.account = :account" +
|
||||||
" AND message.thread = :thread")
|
" AND message.thread = :thread" +
|
||||||
|
" AND folder.type <> '" + EntityFolder.OUTBOX + "'")
|
||||||
List<EntityMessage> getMessageByThread(long account, String thread);
|
List<EntityMessage> getMessageByThread(long account, String thread);
|
||||||
|
|
||||||
@Query("SELECT message.*, account.name AS accountName, folder.name as folderName, folder.type as folderType" +
|
@Query("SELECT message.*, account.name AS accountName, folder.name as folderName, folder.type as folderType" +
|
||||||
|
|
|
@ -1027,8 +1027,6 @@ public class FragmentCompose extends FragmentEx {
|
||||||
db.message().updateMessage(draft);
|
db.message().updateMessage(draft);
|
||||||
draft.write(context, pbody);
|
draft.write(context, pbody);
|
||||||
|
|
||||||
EntityOperation.queue(db, draft, EntityOperation.SEEN, true);
|
|
||||||
|
|
||||||
EntityFolder trash = db.folder().getFolderByType(draft.account, EntityFolder.TRASH);
|
EntityFolder trash = db.folder().getFolderByType(draft.account, EntityFolder.TRASH);
|
||||||
EntityOperation.queue(db, draft, EntityOperation.MOVE, trash.id);
|
EntityOperation.queue(db, draft, EntityOperation.MOVE, trash.id);
|
||||||
|
|
||||||
|
|
|
@ -713,10 +713,8 @@ public class FragmentMessage extends FragmentEx {
|
||||||
db.beginTransaction();
|
db.beginTransaction();
|
||||||
|
|
||||||
EntityMessage message = db.message().getMessage(id);
|
EntityMessage message = db.message().getMessage(id);
|
||||||
for (EntityMessage tmessage : db.message().getMessageByThread(message.account, message.thread))
|
for (EntityMessage tmessage : db.message().getMessageByThread(message.account, message.thread)) {
|
||||||
if (message.uid != null) { // Skip drafts and outbox
|
|
||||||
db.message().setMessageUiSeen(tmessage.id, !message.ui_seen);
|
db.message().setMessageUiSeen(tmessage.id, !message.ui_seen);
|
||||||
|
|
||||||
EntityOperation.queue(db, tmessage, EntityOperation.SEEN, !tmessage.ui_seen);
|
EntityOperation.queue(db, tmessage, EntityOperation.SEEN, !tmessage.ui_seen);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue