From c022d0127062d7b195b1b84a381a42200ed430b2 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 11 Oct 2022 22:09:51 +0200
Subject: [PATCH] Added $$signed$ and $$encrypted$ conditions

---
 FAQ.md                                              | 2 ++
 app/src/main/java/eu/faircode/email/EntityRule.java | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/FAQ.md b/FAQ.md
index 7a19f57e83..cbaec16343 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -2660,6 +2660,8 @@ $$multifrom$ (since version 1.1791)
 $$automatic$ (since version 1.1862)
 $$lowpriority$ (since version 1.1958)
 $$highpriority$ (since version 1.1958)
+$$signed$ (since version 1.1981)
+$$encrypted$ (since version 1.1981)
 ```
 
 Note that *regex* should be disable and that there should be no white space.
diff --git a/app/src/main/java/eu/faircode/email/EntityRule.java b/app/src/main/java/eu/faircode/email/EntityRule.java
index 4d9ac4b14a..c2c4ddf1c0 100644
--- a/app/src/main/java/eu/faircode/email/EntityRule.java
+++ b/app/src/main/java/eu/faircode/email/EntityRule.java
@@ -312,6 +312,12 @@ public class EntityRule {
                     } else if ("$highpriority".equals(keyword)) {
                         if (!EntityMessage.PRIORITIY_HIGH.equals(message.priority))
                             return false;
+                    } else if ("$signed".equals(keyword)) {
+                        if (!message.isSigned())
+                            return false;
+                    } else if ("$encrypted".equals(keyword)) {
+                        if (!message.isEncrypted())
+                            return false;
                     } else {
                         List<String> keywords = new ArrayList<>();
                         keywords.addAll(Arrays.asList(message.keywords));