From e642c378f2d2472e46dd334b0b6bbfb525831d3d Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 5 Aug 2019 15:48:04 +0200 Subject: [PATCH] Check possible notification actions --- app/src/main/java/eu/faircode/email/Core.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java index 3bfdfa3ced..90c6005863 100644 --- a/app/src/main/java/eu/faircode/email/Core.java +++ b/app/src/main/java/eu/faircode/email/Core.java @@ -2218,7 +2218,10 @@ class Core { .setSubText(message.accountName + " ยท " + folderName); } - if (notify_trash) { + DB db = DB.getInstance(context); + + if (notify_trash && + db.folder().getFolderByType(message.account, EntityFolder.TRASH) != null) { Intent trash = new Intent(context, ServiceUI.class) .setAction("trash:" + message.id) .putExtra("group", group); @@ -2230,7 +2233,8 @@ class Core { mbuilder.addAction(actionTrash.build()); } - if (notify_archive) { + if (notify_archive && + db.folder().getFolderByType(message.account, EntityFolder.ARCHIVE) != null) { Intent archive = new Intent(context, ServiceUI.class) .setAction("archive:" + message.id) .putExtra("group", group); @@ -2242,7 +2246,8 @@ class Core { mbuilder.addAction(actionArchive.build()); } - if (notify_reply && message.content) { + if (notify_reply && message.content && + db.identity().getComposableIdentities(message.account).size() > 0) { Intent reply = new Intent(context, ActivityCompose.class) .putExtra("action", "reply") .putExtra("reference", message.id);