From 9cbda608dc0b50fc93d3e7eac787a31b0eb0b5fa Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 25 Jul 2019 10:13:05 +0200 Subject: [PATCH] Cancel snooze on moving to archive/trash --- app/src/main/java/eu/faircode/email/EntityOperation.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/src/main/java/eu/faircode/email/EntityOperation.java b/app/src/main/java/eu/faircode/email/EntityOperation.java index b7bf8dd989..623f92e0eb 100644 --- a/app/src/main/java/eu/faircode/email/EntityOperation.java +++ b/app/src/main/java/eu/faircode/email/EntityOperation.java @@ -134,6 +134,12 @@ public class EntityOperation { if (!EntityFolder.ARCHIVE.equals(source.type) || EntityFolder.TRASH.equals(target.type)) db.message().setMessageUiHide(message.id, new Date().getTime()); + if (message.ui_snoozed != null && + (EntityFolder.ARCHIVE.equals(target.type) || EntityFolder.TRASH.equals(target.type))) { + message.ui_snoozed = null; + EntityMessage.snooze(context, message.id, null); + } + Calendar cal_keep = Calendar.getInstance(); cal_keep.add(Calendar.DAY_OF_MONTH, -target.keep_days); cal_keep.set(Calendar.HOUR_OF_DAY, 0);