From 4d70e1d0cb9a985130fbb49c0aea41edf73ec813 Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 30 Jun 2021 12:36:03 +0200 Subject: [PATCH] Mark trashed drafts read --- app/src/main/java/eu/faircode/email/EntityOperation.java | 8 ++++++-- app/src/main/java/eu/faircode/email/FragmentCompose.java | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/EntityOperation.java b/app/src/main/java/eu/faircode/email/EntityOperation.java index 54ec731e17..f7f1240ee2 100644 --- a/app/src/main/java/eu/faircode/email/EntityOperation.java +++ b/app/src/main/java/eu/faircode/email/EntityOperation.java @@ -204,11 +204,15 @@ public class EntityOperation { if (source == null || target == null || source.id.equals(target.id)) return; + if (EntityFolder.DRAFTS.equals(source.type) && + EntityFolder.TRASH.equals(target.type)) + autoread = true; + EntityLog.log(context, "Move message=" + message.id + "@" + new Date(message.received) + ":" + message.subject + - " source=" + source.id + ":" + source.name + "" + - " target=" + target.id + ":" + target.name + + " source=" + source.id + ":" + source.type + ":" + source.name + "" + + " target=" + target.id + ":" + target.type + ":" + target.name + " auto read=" + autoread + " flag=" + autounflag + " importance=" + reset_importance); if (autoread || autounflag || reset_importance) diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index fd4e2c8a18..a3fc740df5 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -4894,7 +4894,7 @@ public class FragmentCompose extends FragmentBase { EntityOperation.queue(context, draft, EntityOperation.DELETE); else { EntityOperation.queue(context, draft, EntityOperation.ADD); - EntityOperation.queue(context, draft, EntityOperation.MOVE, trash.id, true); + EntityOperation.queue(context, draft, EntityOperation.MOVE, trash.id); } getMainHandler().post(new Runnable() {